OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 22 Jul 2017 16:38:48 +0000 (16:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 22 Jul 2017 16:38:48 +0000 (16:38 +0000)
commit47099cf173469436699b4e58fa501f9c2b2fb003
tree9f3ed1374d69f59c6c876032322ecd564479fc26
parenteca137aa43a36bad8b72d1389a7997dea45e1c37
parent4e3ff0501ff6e2635cab85b448775cc67ed1e64c
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9  -s ours am: ccf6996623  -s ours" into oc-mr1-dev-plus-aosp