OSDN Git Service

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop...
authorBaligh Uddin <baligh@google.com>
Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)
commit56985a1867525557fd15a1b74fc768945ebc56c6
treec028bfe537607823c37e2ffc8c713c73059d3130
parentf321db6800bbfc1e95f82ca6f01002f7d3e5bf2d
parenteb8ce94244706fd12d41740ad949469a10c5ab43
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce  -s ours
am: eb8ce94244  -s ours

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':