tree c028bfe537607823c37e2ffc8c713c73059d3130
parent f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d
parent eb8ce94244706fd12d41740ad949469a10c5ab43
author Baligh Uddin <baligh@google.com> 1445302458 +0000
committer android-build-merger <android-build-merger@google.com> 1445302458 +0000

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

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':