OSDN Git Service

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

Change-Id: Ia30f6cfcc7f7aa54ce3dab4e0f6cdbc75f75204f


Trivial merge