tree 78e8ee465b54097a93aa844f124ad073c4fb3a61
parent 4c0d862711fb2019014a84182b6248478bc2b801
parent 92a95bc5370a1e2a90fa38a2e301515ba42e83a6
author Bill Yi <byi@google.com> 1568850159 -0700
committer android-build-merger <android-build-merger@google.com> 1568850159 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 885dfb7134 -s ours am: a7fd1427da -s ours
am: 92a95bc537 -s ours
am skip reason: subject contains skip directive

Change-Id: Iefb137b703cf19e3c419ab015bd0b386d9ae6279