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 01:12:33 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 01:12:33 +0000 (01:12 +0000)
am: 56985a1867  -s ours

* commit '56985a1867525557fd15a1b74fc768945ebc56c6':


Trivial merge