tree 5cc93c6c5b98dd4cd046953a76fdde3a20eaa115
parent 91ca872a44a1c648b76949928a9e0f44b8d84930
parent e6c59cd9209b0b427785793085d5f4cb0ce5a6f7
author Bill Yi <byi@google.com> 1566488436 -0700
committer android-build-merger <android-build-merger@google.com> 1566488436 -0700

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

Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0