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

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