am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1
am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1

* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.

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