am 2f6d42fc: am 4df8dd8a: Merge change 22470 into eclair
am 2f6d42fc: am 4df8dd8a: Merge change 22470 into eclair

Merge commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f'

* commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f':
  Fix some Javadoc typos.

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