tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 7de8d8acddb5e01853789c75c2eefdb3c2c13500
parent ac0a155effbd9ca4c7f2bb721983a35f9a9b1968
author Baligh Uddin <baligh@google.com> 1422685293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685293 +0000

am ac0a155e: (-s ours) am a834ade4: (-s ours) am e8f27a97: (-s ours) am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'ac0a155effbd9ca4c7f2bb721983a35f9a9b1968':