OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:47:28 +0000 (16:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:47:28 +0000 (16:47 +0000)
commita0a33d158cd6a9f3f959e0b3b85f0a4640ca85ae
treea54b619c576986968c25dd14375d7a400e2c4f4f
parent06ce58b8d5d3d411df7d83579f1badee84b4f013
parenteca137aa43a36bad8b72d1389a7997dea45e1c37
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9  -s ours am: 098c04e781  -s ours
am: eca137aa43  -s ours

Change-Id: Ice5b7d4cacd9b6179e1d60dc3a52a4e3798d0679