tree d6c1d6245c2b21d1206fe3c786466f9a16566975
parent 072b4da6ff2611de7564b423240970ec9130336d
parent 6f2366f1056afabff0a3b9a29cb40d00dad2f879
author Xin Li <delphij@google.com> 1603220624 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603220624 +0000

[automerger skipped] Merge redfin/bramble support. am: 6f2366f105 -s ours

am skip reason: Change-Id I31bc3848255babd08cfc62384565fa685004117d with SHA-1 f09586ee85 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Settings/+/1465938

Change-Id: I4963f86129886143b33a2f7a771bd6790f25ec31