tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 2bccd31abea962113ddfd0973a64f406ef54b61c
parent eaa035fb76fc521123a624ca86fa46fee3d94b3b
author Baligh Uddin <baligh@google.com> 1422669736 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669736 +0000

am eaa035fb: (-s ours) am 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

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