Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
tree: 2c4b137e1115554ba8e5e894f912406c77a3a497
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml