tree 10da860fcff71886af91d082e31f0e1917926848
parent f7e3bf981d30a2fc87076501bf33b5249684eb54
parent 153c3ddc833d10058433c008f9933a765f0261b8
author Baligh Uddin <baligh@google.com> 1422666551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666551 +0000

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

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