tree 9f937dd700dfb2026667530d200cfe5807f48157
parent 83297a095a614008712280105e056ad9ad2f37d2
parent 95033aca4874fc4fbbee9921d020a008b13bf307
author Bill Yi <byi@google.com> 1523072323 -0700
committer android-build-merger <android-build-merger@google.com> 1523072323 -0700

[automerger skipped] Import translations. DO NOT MERGE am: f40ab6f500  -s ours
am: 95033aca48  -s ours

Change-Id: I9530801c90aedea1d2e1bc54209f018fd909ca25