tree 11c910d42d5c37a29f1ae5c43e4df7c104cddb04
parent 5dbae54dfb56b9fb343f7794c31b0dfa85e98201
parent 32b2735ae2e720ba301d946cc8e8b2dedf556fc6
author Baligh Uddin <baligh@google.com> 1413649675 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413649675 +0000

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

* commit '32b2735ae2e720ba301d946cc8e8b2dedf556fc6':
  Import translations. DO NOT MERGE