OSDN Git Service

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

Change-Id: I66cebcb5399ede8fc713c9107d34f23d4b69c887


Trivial merge