tree 2081a6253376d9b44bc5c712a963791abd992a45
parent 98cbf13a339be6dadd8e8968f5b1917a28786f83
parent d81e146d1bb53f6548acb5a1d7bdac59e5973b85
author Baligh Uddin <baligh@google.com> 1412623385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412623385 +0000

am d81e146d: (-s ours) am cda3ca2b: (-s ours) Import translations. DO NOT MERGE

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