OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 19 Sep 2016 18:36:50 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 18:36:50 +0000 (18:36 +0000)
commit8469c012943e3f04ca7a7135c10cd9f522dc02ce
tree26113f1ce6aeb779cdb890e8c0736b60ef1db82d
parent9cc0e282049735b4e1df901a89de9e1c7fb2a631
parenta365d9123c44ac49fa1bbd33853f3dd2db918592
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a365d9123c  -s ours

Change-Id: Ie64b56ae99d4363edfbeb2d637d89abd6e356cac