am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '4aa0295b355ce17e2da195907ea5dc0322837351':
  Remove deprecated locales - DO NOT MERGE
tree: f76a9b5d80a904e20d7a1f22bed49c45ff1e1318
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml