am dd441795: Merge "Don\'t strip country and variant from locale." into mnc-dev
am dd441795: Merge "Don\'t strip country and variant from locale." into mnc-dev

* commit 'dd441795409f26f45de3ce40a1bab4121cfcefe5':
  Don't strip country and variant from locale.

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