OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Jun 2017 08:15:26 +0000 (08:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jun 2017 08:15:27 +0000 (08:15 +0000)
commit8315525c76375641b5d5c7303f34471e9365de0d
tree25fb3e9f0846f0482135e14ea8e15e6d6be5a0c4
parent52eb8912006e599e2e0bd756d30b9657850a7c09
parent1c6a01293a69806c4710693dbb2cc265a98d3e1d
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7  -s ours am: 0c2bb34f5c  -s ours" into oc-dr1-dev-plus-aosp