tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent ef69114ffb59392c7f2f7872e1c27d2a43f35c21
parent ab9135e49001cce0dbd93c07bf3cc7c966b11a1f
author Baligh Uddin <baligh@google.com> 1392411015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411015 +0000

am ab9135e4: (-s ours) am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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