OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c3ba50cc48 ...
authorBill Yi <byi@google.com>
Mon, 21 Nov 2016 02:06:16 +0000 (02:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 02:06:16 +0000 (02:06 +0000)
am: e01dadb8bf  -s ours

Change-Id: Ifa08f376895bd9c238aceb7a2c0a48447ef1bd2e


Trivial merge