OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0220f7863 ...
authorBill Yi <byi@google.com>
Mon, 21 Nov 2016 01:53:55 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 01:53:55 +0000 (01:53 +0000)
am: 1719121852  -s ours

Change-Id: Icb798c356b372cc192c49144c3ffa6787b492a42


Trivial merge