tree b22ea2ce86f3654136cf349bcebefe7deadac701
parent 122cd44a6c892b3a6e7d6994794d4cb097e38203
parent 785208ec13a5cb7e71f2532d3ba11c738bc09a21
author Bill Yi <byi@google.com> 1539600128 -0700
committer android-build-merger <android-build-merger@google.com> 1539600128 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 578bbbf4df  -s ours
am: 785208ec13  -s ours

Change-Id: I86b7cea052ae758acbf05d39b2d9280f951caaae