OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123 ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 20 Jul 2017 10:10:12 +0000 (10:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jul 2017 10:10:12 +0000 (10:10 +0000)
commitf9a0de0fa3566111a1c506967f14a768246ea624
tree682a7846840ed27e236c3ae72b732f9703eaa185
parentb2883febe924cc4cdb2023c78f86714eca4861d6
parentff96b3446eed941859adef26d93d4e5d3c242810
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours am: dfd75c536f  -s ours" into oc-mr1-dev-plus-aosp