tree a35d421f0bb7cdb678adf3ac5f7a2c3fc56b0071
parent f96b550236729f97cf7d413c1d35e1b66b5b08c7
parent 0e00d115e8c87f8126c0be765531fff9a0693495
author Baligh Uddin <baligh@google.com> 1411189524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411189524 +0000

am 0e00d115: (-s ours) am cd19c2dc: (-s ours) am d77daa32: (-s ours) am 6014bdb3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '0e00d115e8c87f8126c0be765531fff9a0693495':
  Import translations. DO NOT MERGE