tree a8e0c84c716c0ebad45aaf6e51a28cf285457b49
parent b2497c1d9c54e2634cbe653812239870a76ea9e0
parent 132a22ecece15ea69f8d7b0368d2ea35797388e6
author Bill Yi <byi@google.com> 1569452705 -0700
committer android-build-merger <android-build-merger@google.com> 1569452705 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 890bcfa7ac -s ours
am: 132a22ecec -s ours
am skip reason: subject contains skip directive

Change-Id: I8a91db4da2b410c9eb18e2b14f497b33d4538b17