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)

Trivial merge