OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 22 Jul 2017 17:20:10 +0000 (17:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 22 Jul 2017 17:20:10 +0000 (17:20 +0000)
commite6eba20c1519e710b9e029f6392d30cdb4ecda83
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parentc6875184b6506bfb615c84d0eb28ec4715b89d5c
parent9caeec066dc409c90a0c4e652b371508863aeef7
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae  -s ours am: 85de7f20ab  -s ours" into oc-mr1-dev-plus-aosp