tree 54e5a5e4e5f084722569a1cbdb1bbf032e725e90
parent 83dc9d977e39d8069f4228bbbaf3df42efabecff
parent 5d448d8d00145cb17ade0a1a075e0a8b0b834c80
author Bill Yi <byi@google.com> 1558760452 -0700
committer android-build-merger <android-build-merger@google.com> 1558760452 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s ours am: 7c32992183 -s ours
am: 5d448d8d00 -s ours
am skip reason: subject contains skip directive

Change-Id: I21ab64d4db2d63825b92634c8e1ed9e6b0043a1a