tree 11c910d42d5c37a29f1ae5c43e4df7c104cddb04
parent 06871183b1d94acd7f52db6a4892c2dbea931ca1
parent ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05
author Baligh Uddin <baligh@google.com> 1413648492 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648492 +0000

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

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