OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 21:31:34 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 21:31:34 +0000 (21:31 +0000)
commit14ebe7a75d2fbde48041cebe059e0447f7ac85e1
tree58611fccc51d805e2eafd11873f34114301b8e64
parent34d159fca7cb18712b331d65260ceab32dc55e82
parent2d50ad831e3fae27f14ee10ad4ab8ae09592d6b0
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8  -s ours
am: 2d50ad831e  -s ours

Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f