OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae ...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:16:59 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:16:59 +0000 (17:16 +0000)
commitc6875184b6506bfb615c84d0eb28ec4715b89d5c
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parent0412212ef1817c17fecfc4ec16d52f0ea99b6df7
parente3f6e69af107738fad1b477a860616d6f5e045b1
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae  -s ours" into oc-mr1-dev
am: e3f6e69af1  -s ours

Change-Id: Ib0bc3bdae13c6af93d0841744c60a49c8152f255