tree 1e53b24f1a6459063b02f49c51949a561c1d75ea
parent 20ea9e8b672ab03c267ec89c80ac6fa89cf659bf
parent 609752393883f0645b3d84541a4940470dce3f0d
author Bill Yi <byi@google.com> 1563212744 -0700
committer android-build-merger <android-build-merger@google.com> 1563212744 -0700

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

Change-Id: I5ec7c792775c69a245da1ebd104d90b32d8e67f6