OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Jun 2017 02:41:01 +0000 (02:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jun 2017 02:41:07 +0000 (02:41 +0000)
commitcea026e027255dec29e2b0e457dfa4f1129a4c00
tree9a8f65cf0e21300e1dd6018fbf97dc520010dcb6
parent50a405cf2cda54fbd6817c62d0a27fa4fc82c5dd
parent2d8c070c500779dcc3428869b40b72ce8e04958b
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a  -s ours am: 15094560a4  -s ours" into oc-dr1-dev-plus-aosp