am acd4f7cf: am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
am acd4f7cf: am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."

* commit 'acd4f7cf37487c55c6b15aa40f2da57b542dcebb':
  Remove copy of Locale.adjustLanguageCode.

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