tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ffe21b31295b2195b219372394096253dda64e89
parent ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05
author Baligh Uddin <baligh@google.com> 1445300905 +0000
committer android-build-merger <android-build-merger@google.com> 1445300905 +0000

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: ab474588ce  -s ours

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':