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:44:32 +0000 (01:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 01:44:32 +0000 (01:44 +0000)
am: 610d943dd6  -s ours

Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e


Trivial merge