am c61a7575: am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
am c61a7575: am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit 'c61a7575eb0e3d1788ce1946da81d6c5e6812b9c':
  Remove bogus 2 char limit for locales and countries.

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