tree 0a58fdeab01f5b110e5212a12b25a1bc38bde348
parent c12b92947557c9b9911eae1d370662acabe2bcb9
parent f0a0efaa04e5684ff844d327e42495a76ffc79db
author Baligh Uddin <baligh@google.com> 1365810342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365810342 -0700

am f0a0efaa: am 75d29e40: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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