tree 8867e66ecb36e20953649878fa1a0818a40dec8e
parent 6925ff2c8253cc70d303853df7efcffa85a0287d
parent f5c2bc2d02069c97dc85e25698a38af02de956ca
author Bill Yi <byi@google.com> 1555157947 -0700
committer android-build-merger <android-build-merger@google.com> 1555157947 -0700

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

Change-Id: I52b335f61a8bb789be88130b35ffdc449384d228