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:50:20 +0000 (13:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Jun 2017 13:50:25 +0000 (13:50 +0000)
commitbaa8af8d0d08f726f5ae0d36b0203bbcc3516bed
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parentd772e224d7e279acbeb957a6806545551404b3d7
parent2a8069da03d43d1e933d4b7db5924b4a4e4c09ce
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1  -s ours am: 131ccb00a8  -s ours" into oc-dr1-dev-plus-aosp