OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE am: 11ebb14241 -s ours
authorBill Yi <byi@google.com>
Wed, 11 Jul 2018 17:55:29 +0000 (10:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jul 2018 17:55:29 +0000 (10:55 -0700)
commit299f0ea6e98be433aacc7879dfbacbaf398f1478
tree140a68e1a5f7386387e7dce920ad5c2920de3b04
parent483bd692efb948ed2e293337ee7c43e8828bed21
parent78f73c3352087a41f4b8e1d5640457848ff0aae0
[automerger skipped] Import translations. DO NOT MERGE am: 11ebb14241  -s ours
am: 78f73c3352  -s ours

Change-Id: I56573cf23cf9cfb1f849f207afdcb3c63f2445e5