tree 8088b2b3fb6424d9c238eb11b8bdb837de7a7a18
parent 3010e66ec437266e1f47f5d5fb57eaa13b2a3be1
parent 4c70d5d02df1bcb5d789da8ddcdb9e906e694454
author Bill Yi <byi@google.com> 1569422270 -0700
committer android-build-merger <android-build-merger@google.com> 1569422270 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 92214baec2 -s ours am: 4a8558e9d8 -s ours
am: 4c70d5d02d -s ours
am skip reason: subject contains skip directive

Change-Id: Ic69c8b1808ba6956a5ca608fd0d031e098744fa9