OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Wed, 16 Aug 2017 20:42:31 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 20:42:31 +0000 (20:42 +0000)
commitc9246aef857aaacb7f3616f95a0d96f1dc7a841c
treee34f9c3fdf38e2b3b921da176593a5f2e98332b2
parent060a9d102144b9f0d808af7fd2ec5009e61b4b6a
parentfd457b1220a1f4c73892576cea16871e876c898f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: fd457b1220  -s ours

Change-Id: Ia15a920f9a1af9e11d12a7fdd87845c2d27d72d2