tree 4272a4ac070341bfa286874b6b25f87f73d02cf1
parent a72ff6f7ff8cb15ba5971fb3d5be4b5fe2c64405
parent 2245b41b31f0c1257c20261bfe762afa03563166
author Bill Yi <byi@google.com> 1574699437 -0800
committer android-build-merger <android-build-merger@google.com> 1574699437 -0800

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

Change-Id: If89fcb13087b6a6c27bbc9e35b77e435b35b24f7