am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread

* commit '274ee68d32237d95f05c269c250146d9b3202fbc':
  Fix javadoc which broke build.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base