Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
tree: 87ed9d514a845e5e072e9b8e7efd3decf08e043f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags