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 00:28:00 +0000 (00:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 00:28:00 +0000 (00:28 +0000)
am: 6317598a19  -s ours

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':


Trivial merge