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)
commit17191218520eaf8dc2a717ae73d07bd1ad9d6fe4
tree2406fe8280cf92fb931fa11c7e69e351249326c5
parent8ac46e4ccd9e8cce85df7743b4b490ffd2c0d6fd
parent610d943dd6293256b4f30d19cbc68cf6741a8e30
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0220f7863  -s ours
am: 610d943dd6  -s ours

Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e