am b70888d4: Merge "Fix a typo in a javadoc comment"
am b70888d4: Merge "Fix a typo in a javadoc comment"

* commit 'b70888d45573c015fbb9d584df575bf78f5e9684':
  Fix a typo in a javadoc comment

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