tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 54dc3d161655693062b65fda9a50303bb6c3e54e
parent ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0
author Baligh Uddin <baligh@google.com> 1422685313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685313 +0000

am ca4f3f09: (-s ours) am 30ebce48: (-s ours) am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0':