tree 42ff5543ec1bea3ab5f78b5ce8bc63e80a8aabef
parent fb291f5a472c11473d936088562cd35a07c4a4b8
parent e51280312e0ae7bdfba356cd7a60df6bdab63af9
author Baligh Uddin <baligh@google.com> 1381204447 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381204447 -0700

am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

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