OSDN Git Service

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop...
authorBaligh Uddin <baligh@google.com>
Tue, 20 Oct 2015 01:30:31 +0000 (01:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 01:30:31 +0000 (01:30 +0000)
am: 03937ac5d7  -s ours

* commit '03937ac5d7c2dae4d730bc6cea6d42c63ad13181':


Trivial merge