tree e236d53036251d5b2221b234c95ebcdb8909850a
parent 8ef581d0e534da4447ccd6d820e0954ee4c4862a
parent 4e80b7db679af0700d5280f3fb1c3b72afc99bcf
author Bill Yi <byi@google.com> 1556322433 -0700
committer android-build-merger <android-build-merger@google.com> 1556322433 -0700

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

Change-Id: Ic7bed57d9629af59851555dc0aeda40b13b4cb0f