tree cb98941a78902e8991a344ba7950b4c580eafef7
parent 1e6e422c6970c7a277f80aa7b00a5620fb47ecb7
parent d0757b3a6fb2183034070a303658be939b454457
author Bill Yi <byi@google.com> 1574710786 -0800
committer android-build-merger <android-build-merger@google.com> 1574710786 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 942cf4962a -s ours am: 9fa066742e -s ours
am: d0757b3a6f -s ours
am skip reason: subject contains skip directive

Change-Id: I5d78b953eb00228059ed52c9db3264b024dc5052