tree c028bfe537607823c37e2ffc8c713c73059d3130
parent fa65343fb615a418fd1e192db40f12650af42a81
parent 8d5bd9f385e5c89a32e58c994c28c22e711749a4
author Baligh Uddin <baligh@google.com> 1422685325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685325 +0000

am 8d5bd9f3: (-s ours) am 53c13a87: (-s ours) am b17186c7: (-s ours) am bc566e74: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '8d5bd9f385e5c89a32e58c994c28c22e711749a4':