tree ec3c03feb82870c58a07aa071a0d5220bfe69be0
parent 5019f033c55d258d8cfced64181a39b7f4e59500
parent 0b866e599f31ea5291cae30c81e9df53a06ca1cf
author Baligh Uddin <baligh@google.com> 1392411607 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411607 +0000

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

* commit '0b866e599f31ea5291cae30c81e9df53a06ca1cf':
  Import translations. DO NOT MERGE