tree 955d22f2c3470f8d81cbf7528ec90c11fa025160
parent e72b993b912b61f53bdb00d5e36b346016887e8b
parent 76b2775eee4627d974c6286ae1091e9e591c00ab
author Bill Yi <byi@google.com> 1570817421 -0700
committer android-build-merger <android-build-merger@google.com> 1570817421 -0700

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

Change-Id: If89a18a90a0f7a869340890b22410c25286baf81