am b2c02637: (-s ours) Merge "Lightweight fix for incorrect locale changes - DO NOT MERGE" into lmp-mr1-dev

* commit 'b2c02637c8ab6fa1ee296aa90c3fa18bcd2aa6b0':
  Lightweight fix for incorrect locale changes - DO NOT MERGE
tree: dd6db787141945be85feea73e1150556e0385b32
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt