tree 421fe70cea58380fa217adb9681b4d1099980410
parent b77b018ec791f39736dd3e6443231d5ea2344e9a
parent bffbb6b0609e50f630aaf329e88dda6c9cf98d8a
author Bill Yi <byi@google.com> 1559097920 -0700
committer android-build-merger <android-build-merger@google.com> 1559097920 -0700

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

Change-Id: Id00fea5ed1ec1b91c95dd641785499aca3daf205