tree 6bd777354c1096acc2a2ca6e0e7f58ea3376fb61
parent 881aba7f60ef50383da01a4b8cd8e3f065344d50
parent ff2c24712bf860b77d356b1fa524b16a676aaf1d
author Bill Yi <byi@google.com> 1560883386 -0700
committer android-build-merger <android-build-merger@google.com> 1560883386 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: ff2c24712b -s ours
am skip reason: subject contains skip directive

Change-Id: I7ef0d1c7a7d416bda23a024ea2a6d4f19389a6dc