tree d5080547dc601f59284f816af7117e09c719d9a3
parent cd5fc288e1949199d274c61139352c4767cbd267
parent d5e671d32a93ce2cdb98ab1436d8eb9c32b2287e
author Bill Yi <byi@google.com> 1558513508 -0700
committer android-build-merger <android-build-merger@google.com> 1558513508 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours
am: d5e671d32a -s ours
am skip reason: subject contains skip directive

Change-Id: I87a798d992e2fbcb7323f1e0c1644c8963fdefd5