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:49:33 +0000 (13:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Jun 2017 13:49:42 +0000 (13:49 +0000)
commitd772e224d7e279acbeb957a6806545551404b3d7
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parent7a5ba9d90115d0dbca093a21237e39a8aaf70422
parent1d0b54c6853d5a3c22a6bb392a4030c159152a5b
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c  -s ours am: 4b209f21b6  -s ours" into oc-dr1-dev-plus-aosp