OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 16:55:09 +0000 (16:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 16:55:09 +0000 (16:55 +0000)
commitbc29827898d3a781494847751398578ffc06f93d
tree6ec3564d75a51fc93b058cc9bb8cc69f629a5cd9
parente83b74298f936169fffcafbcc2b8a796fb39e228
parent015210bc770db531fa17cef94c0419e1bf4f05b3
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 015210bc77  -s ours

Change-Id: I82210a83455d828cd4fda585127dac791c67235e