tree 2960accfae8c2b7accb672df3724a013f98b1510
parent 03da98f21f18c14848e49bcd408f9c564020e109
parent 5318a0d3059c65f51464c7110e34d4f5a33de7be
author Baligh Uddin <baligh@google.com> 1380944542 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380944542 -0700

am 5318a0d3: (-s ours) am 249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '5318a0d3059c65f51464c7110e34d4f5a33de7be':
  Import translations. DO NOT MERGE