OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 22 Jun 2017 13:51:19 +0000 (13:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Jun 2017 13:51:23 +0000 (13:51 +0000)
commit67a43ea494d715026e37703689c987d5cbf97c9c
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parentbaa8af8d0d08f726f5ae0d36b0203bbcc3516bed
parent5decd02bc9cb030dcd9a15937508d220d7c1dbe6
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1  -s ours am: 1a588ec465  -s ours" into oc-dr1-dev-plus-aosp