am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)

* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)

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