tree 2ed04c7a0c327d31e8b396e83ac2ad672fd805df
parent 71a7bed6df02d8089373a22e94bb5d0a430a2540
parent aa61fd71e169d64cfd243af49694b6fdb0a8e28d
author Baligh Uddin <baligh@google.com> 1392410248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410248 +0000

am aa61fd71: (-s ours) am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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