tree 7bffd26e2c854f061693a49b52b27f90ed0e5bf8
parent 9d441e140a07ec6c5c5396f634230f2c18877ea9
parent a703eb0fdf4b722939d601f667c0d123e86b59a7
author Baligh Uddin <baligh@google.com> 1411187916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411187916 +0000

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

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