tree 08077aa13135b047692ce8bfb17e3f364d7de4eb
parent 2b2207192fb80653bb9a09ccc1275585a2da86c2
parent c20d9fc117bcecbd068e140899d932b87bc1bd53
author Baligh Uddin <baligh@google.com> 1378395236 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378395236 -0700

am e473688b: (-s ours) am 630e76f0: (-s ours) Import translations. DO NOT MERGE

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