tree 5283dddeb2c6b156596c1d596cbdf439e1ff942c
parent e258cc65f64fe0e2a32961e1484ca011ce98f92f
parent 332e8f4e811e331ddf17103980b43801f6a9f027
author Bill Yi <byi@google.com> 1570343409 -0700
committer android-build-merger <android-build-merger@google.com> 1570343409 -0700

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

Change-Id: Id2f6efd386d21d7a80994896ed40f45d896e4716