OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 22 Jun 2017 13:48:49 +0000 (13:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Jun 2017 13:48:55 +0000 (13:48 +0000)
commit7a5ba9d90115d0dbca093a21237e39a8aaf70422
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parent3370e44417da4490d79af3b10dd4a5e5f62a8928
parent58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c  -s ours am: 70c2a7b0d9  -s ours" into oc-dr1-dev-plus-aosp