tree 12a7d6f55aede438d3214722271312f199a9ad5e
parent b16200e89eb8503ab70fe531aff8d2fcda15d3d3
parent f82c86c26c0ba9896b61270b48a8e4f82d7d7fde
author Baligh Uddin <baligh@google.com> 1412004715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412004715 +0000

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

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