am 5f216179: (-s ours) am 9f061d29: am 77456727: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '5f216179fc238c113a1426a3cdb3e1bb89932919':
  Remove deprecated locales - DO NOT MERGE
tree: 8d5bf7e2e9743e7f5c18415b4a9f37dd330b210e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags