OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)
commite69bfac15f03ef6f0ba7277b9b0c87f214326f26
tree4fb4147ab884e56832ce2bca928eebb0735aea49
parentf538cddd1d3573eacbe9aeb5a233f685f363dc98
parenta93169837a6c5ca912aaf2b62ab7ccea3b21c43f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483  -s ours
am: a93169837a  -s ours

Change-Id: Iec4ce94d01d5f516541e795ee2eb740a495357f7