OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545...
authorBill Yi <byi@google.com>
Thu, 27 Jul 2017 00:16:06 +0000 (00:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 00:16:06 +0000 (00:16 +0000)
commitb64712cc3b248f52518e9081b38021a5b4d82c42
tree6d161c9bffdd16f5f681d9ff205fd20c463ac0dd
parentea3b8238a30c3ad25fe725ec5ee686091a7f8858
parente0a07a210d3f7e065739153cf094f7af018e565a
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours am: 611a6ffe29  -s ours" into oc-dr1-dev am: 527cd8b04d  -s ours
am: e0a07a210d  -s ours

Change-Id: I8fa1bb157ad4645a0a02288f5e40416c75cdc26c