tree 42ff5543ec1bea3ab5f78b5ce8bc63e80a8aabef
parent 93e416b26a8b49873b9b488e26f603baa044aec8
parent c4a95d3c4b5951502f1602a79af727b6a7b5525f
author Baligh Uddin <baligh@google.com> 1381204640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381204640 -0700

am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

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