tree 9102a533f05cb125a389c150a1f5a2fc627d36af
parent 16e77f8d44b291ea51e010e3be7ac983a8102103
parent 22065f290cd6d52a7d72e165759bf8b3b536e17c
author Bill Yi <byi@google.com> 1563234013 -0700
committer android-build-merger <android-build-merger@google.com> 1563234013 -0700

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

Change-Id: I91a49443a2363a06213cb55c0635c0fdb7abde9c