OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 ...
authorBill Yi <byi@google.com>
Tue, 1 Aug 2017 16:00:58 +0000 (16:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 16:00:58 +0000 (16:00 +0000)
am: db925ec4cd  -s ours

Change-Id: I7f35b4130090c0f2f8d0c093268ca5af7fcf7d37


Trivial merge