OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3 ...
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +0000)
commit5b595004084ce24df98e542fb09dcffdfdd6d32b
tree02a0e042e1e2e002ed79fd16512450c069dfb74d
parentef44c49c8820721090611c49ce25b84a94c4d805
parent1866df21f9ea8c5ee9de0fb7d91182e856d46ac9
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3  -s ours am: 3b79072040  -s ours" into oc-mr1-dev-plus-aosp
am: 1866df21f9  -s ours

Change-Id: Iafd3408ca1a7fd716ac22f7d7b2a33e053bc6b5c