tree 83899c2df1cb6136702232dfd522e07f3de68670
parent f16ef62acdddc77d6fe0026de8f39b1c2f4d986e
parent f3dc2c86996b88c8e67d961a062be072664166f4
author Bill Yi <byi@google.com> 1564176997 -0700
committer android-build-merger <android-build-merger@google.com> 1564176997 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: f3dc2c8699 -s ours
am skip reason: subject contains skip directive

Change-Id: Idafb79a7e4f88bf2f2f4d6a37cf0d682e688edcf