Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: c595f2581d  -s ours
am: 551abbb559  -s ours

Change-Id: Ifdf268a6529c07e5e5693e0fb494edaeb575ba14
tree: b748c1f317722b5cc2d2c89ca6496b0a0a25949f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags