tree 8d2ce005ef9fc82542843aac39407e5bf3473a47
parent 9a1506dd2b65236d5cbe2a0622075a2187e5df91
parent de4817e7ef5cc5622eb3fa66962e46b729b178cc
author Baligh Uddin <baligh@google.com> 1392410244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410244 +0000

am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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