tree ec3c03feb82870c58a07aa071a0d5220bfe69be0
parent 7e638c722830ed05a2aa17fc1fc02d7842b8103d
parent 20dcb55cad5b9a37d8e99265266b573d768b8c95
author Baligh Uddin <baligh@google.com> 1392411145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411145 +0000

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

* commit '20dcb55cad5b9a37d8e99265266b573d768b8c95':
  Import translations. DO NOT MERGE