tree 59b57aecf2fab34eb19fe5880c98ffecd94ae2a6
parent 26a9e5fbc7fe84b46805e23fe575ff9ee2c22e17
parent b38a37cb1ca2fba2c65a744d774bb382e10cd886
author Bill Yi <byi@google.com> 1555157885 -0700
committer android-build-merger <android-build-merger@google.com> 1555157885 -0700

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

Change-Id: I22f3f56acba504247a46b74d32e165b04dceac7f