tree 9955468ede2e0486e76710fe06eb16891f7cfd12
parent f8129bc20a61808fb3969cd335465f6cbd146c33
parent 49c45c005f22edca8f09689bea08d72af8e6a032
author Bill Yi <byi@google.com> 1558885524 -0700
committer android-build-merger <android-build-merger@google.com> 1558885524 -0700

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

Change-Id: I4476564db9ce769f8b1b8f20dee3a84dbdefb903