tree 10da860fcff71886af91d082e31f0e1917926848
parent f43b4dae3bec8a48770ee9baf73b82fe52cb271c
parent be0bf47a87b2c96507d80a1649137962b9cc07a3
author Baligh Uddin <baligh@google.com> 1414566318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566318 +0000

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

* commit 'be0bf47a87b2c96507d80a1649137962b9cc07a3':