tree 383bfb90e1940881c4f125f4b595ef1d2ad44e5a
parent 369bf1d17db3bdffbf7ecb4e1bad7949f0c9f2d6
parent b5071e4a19f025ab537402d71d641ecbd75ae3cc
author Baligh Uddin <baligh@google.com> 1412023829 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023829 +0000

am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE

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