OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 27 Jun 2017 20:15:49 +0000 (20:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jun 2017 20:15:55 +0000 (20:15 +0000)
commit8f1ccc824c59746371b6e7e0aa97be7195484484
tree82f93790407f55dd3e2c6556766069837fe8c0bc
parentc999d0d55d2358c3192160cba55caa4c28361d6d
parent8c352f1e267656dcf7ad9c14d3d00ca772dce06b
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours am: fb1469df92  -s ours" into oc-dr1-dev-plus-aosp