tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 348df67e4ea1dcfb3c41b5729b7187660ad7324d
parent 5c49a8dff24feab476d2c379fbb7e521f2996c8c
author Baligh Uddin <baligh@google.com> 1392411083 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411083 +0000

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

* commit '5c49a8dff24feab476d2c379fbb7e521f2996c8c':