OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc ...
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:57:21 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:57:21 +0000 (22:57 +0000)
commitd155dba63d6b6738b0e3798177dcfcd85297b877
tree8a90516477f5582eb09a2b207b8291abbc50674f
parentb6d988c4a82e0d6e945183eb9244ab5f0fd254d7
parent2c57ac25c6d442ec7ba236ab51871ab9c3cc89e5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc  -s ours
am: 2c57ac25c6  -s ours

Change-Id: I71ff293a1279cd06e1cb063cc2c22db160cd31f0