OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Mon, 7 Aug 2017 05:25:46 +0000 (05:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 05:25:46 +0000 (05:25 +0000)
commitfdcf523f18d8b74d2ce46708a9e108e22bb0500f
tree0d87955776e00fb5f4fcf430f92d038c3102e244
parent8ca1114359c93439ef4837661beb1ca3a6ee2b1f
parent1d14f1ada046ad15cbfa9e3cd91f64dd094a5c59
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1d14f1ada0  -s ours

Change-Id: I72f90c978992b58da4ac14d390fb3f16ec2ead34