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

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE