tree 828e6622b4bef017d4f1ed38691b214551f0a50c
parent a6a0031a0c08f22392db501ba786e6e1149d233e
parent b15357267f4f96b4b99c7b3cb3dc2a342538d0e7
author Bill Yi <byi@google.com> 1544572789 -0800
committer android-build-merger <android-build-merger@google.com> 1544572789 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7  -s ours
am: b15357267f  -s ours

Change-Id: I06cacb795cfaca029e65e1d593b290efa57c32b9