tree f74d60caecab2530919fc32243d029690b87ce58
parent 41a7f9de317b6d7430ec0ef784ee92ed49dbcaa7
parent 13d6e13166af767036baec091a6781c3d1aa15b9
author Bill Yi <byi@google.com> 1562717762 -0700
committer android-build-merger <android-build-merger@google.com> 1562717762 -0700

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

Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc