tree 2b47d6794efad471f37d9d252ceb9df82e9931c0
parent 2dadf151657f874ab4232cad147a3a34ffe0e93e
parent b3581e7602cd1def9bb9c21f4c3e705dfa9f0191
author Bill Yi <byi@google.com> 1550632943 -0800
committer android-build-merger <android-build-merger@google.com> 1550632943 -0800

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

Change-Id: I09840927198a83c3c0b12729f47337fd223c2c3e