am 6c67a4d8: am 55e7efe0: am 0fcf4161: Merge "Update some strings." into mnc-dev
am 6c67a4d8: am 55e7efe0: am 0fcf4161: Merge "Update some strings." into mnc-dev

* commit '6c67a4d81c2a46c85ef23209494c5c6ce3a8d26b':
  Update some strings.

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