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)
am: eb8ce94244  -s ours

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':


Trivial merge