tree 123921bed1774e4954576c482642808e7a0de07b
parent 222fb83b1f61469d15e20a22e5af58ceb86288eb
parent 628893bfbe0eb9870e8c1b1bf0165ccd9e281383
author Bill Yi <byi@google.com> 1569641132 -0700
committer android-build-merger <android-build-merger@google.com> 1569641132 -0700

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

Change-Id: Ibad97b6964a8e858302e6929fc687ba36d7f081b