OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220 -s ours
authorBill Yi <byi@google.com>
Tue, 26 Sep 2017 19:03:54 +0000 (19:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 19:03:54 +0000 (19:03 +0000)
commit133d4881efbbb6b5f17f2a74a733f923bcf78e1e
tree33d33cff0946c3ac36f85389ebe98bfe155a30e0
parent44b2b486ae840cac69e72e099f813446ff2b428d
parent46181531ecad1a4784031d24b77003fd3db17e46
Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220  -s ours
am: 46181531ec  -s ours

Change-Id: I2dab29638f0813d6e52c9b4ec7b279b7ddcb06a0