OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)
commit6689d34fface3cba4a6858225b6279492f92bccc
treeb8b6458f71902ec8abef43b8370497a631aa5a2f
parent0594674ecb6cc9811f2c56a41fbb39c404296083
parent4ad0db127e14ccf1f2f0faeea967e74d60cb38c5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b  -s ours
am: 4ad0db127e  -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541