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

* commit '399f1df38594ea8bc927ad23bfbde996a9dc161d':
  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