OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:26:37 +0000 (16:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:26:37 +0000 (16:26 +0000)
commit1265a3d8962d7fc5476b5d5463d0258ca0677d9e
treeb8b6458f71902ec8abef43b8370497a631aa5a2f
parentac5424882581416c1d83f16f893a96efb1d58026
parentea0e76bc47ad75a61ccba5845e683687b197b73f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f  -s ours
am: ea0e76bc47  -s ours

Change-Id: I04efb209a566cd13e1e06f4e9cc9270a7b886cbc