tree 7bffd26e2c854f061693a49b52b27f90ed0e5bf8
parent 9f7b41861fb725ca00694ebf3659e0f3045f40a2
parent 153c3ddc833d10058433c008f9933a765f0261b8
author Baligh Uddin <baligh@google.com> 1411187720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411187720 +0000

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

* commit '153c3ddc833d10058433c008f9933a765f0261b8':
  Import translations. DO NOT MERGE