tree 2c846d13148b3a8c6a4b44f147b1b07cac8ef227
parent eb43e960649c674c8f0c8c0386c8c48e12574435
parent 3edcf5fc3d1212b3c221f2f375ed8a77088cb486
author Bill Yi <byi@google.com> 1546103064 -0800
committer android-build-merger <android-build-merger@google.com> 1546103064 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 8bf593bd5b  -s ours
am: 3edcf5fc3d  -s ours

Change-Id: Ic735034d7defbe348e0fbfd419f9157c509152f2