tree 272726afe08fb4e1d808aa690c7d6ce587d25dcf
parent dc4f412af1d0a2fcf7414af18f05a4f5a977e463
parent 7e2c9f95013771987f899a7b3e07cfa426155652
author Xin Li <delphij@google.com> 1633679825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679825 +0000

[automerger skipped] Merge Android 12 am: 7b74d94e99 -s ours am: e92a427dd3 -s ours am: 7e2c9f9501 -s ours

am skip reason: Merged-In I70bbfc1b668102470df4085fc51943538d9017a5 with SHA-1 1b05fe17e9 is already in history

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

Change-Id: I304ed4a2b8165e25cf889b4dae43d9d21d019b4b