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

am b2ad3df7: (-s ours) am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'b2ad3df7e0e80d589ffaba72330e31585f940252':