tree 13d0f37ed75dc501a727bbe0d404b5a49d6956a4
parent 584855c3951d832db9f0aa328d5a216729e61025
parent b3c7098d1cd77a4b3d17ea2e615cd343b233bd85
author Baligh Uddin <baligh@google.com> 1415375602 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415375602 +0000

am b3c7098d: (-s ours) am c8eed289: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'b3c7098d1cd77a4b3d17ea2e615cd343b233bd85':
  Import translations. DO NOT MERGE