OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 17:35:27 +0000 (17:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 17:35:27 +0000 (17:35 +0000)
commit375ee4625d20493ed792ee1deb69382a567bcd14
tree8c8c1a5da9aa24101015a9625f2ab8f590b7668d
parenta93169837a6c5ca912aaf2b62ab7ccea3b21c43f
parent56b37be1c91101fd8f40b23373ea49450e975f5d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 56b37be1c9  -s ours

Change-Id: Iae044e0aa00c834d4ba2a326eab390ff820bd907