OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 9 Aug 2017 22:52:06 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 22:52:06 +0000 (22:52 +0000)
commit71460b085932b07ae5bb2e2aaea39eb5f8aeed4a
tree6e65cf0d46b8f6b3cff4d5937e97a7006704632a
parent6df5c65f45892886d705cee5d17a4880128ca449
parentaeee65914768a1b87450edcf1d24740cc80ffbfd
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214  -s ours
am: aeee659147  -s ours

Change-Id: I446a2efc2cc4afda46abdb775ffb36044ae82983