tree 8b94e02c49c01dfca4ce7bb4bc65af8664f45eb9
parent 89a9c6844fb88f80bb7015df41110f9843c2a14b
parent f66042e2d0e05fba2fd4baae0a46494e8dad5d07
author Bill Yi <byi@google.com> 1560090789 -0700
committer android-build-merger <android-build-merger@google.com> 1560090789 -0700

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

Change-Id: I49c9625202e11ce949838b798a523a21bb56fcec