OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 26 Sep 2017 19:18:31 +0000 (19:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Sep 2017 19:18:31 +0000 (19:18 +0000)

Trivial merge