tree f262a970b2b3dad07cd3215cdfab709c2f2a2ac1
parent 4c43b540ff5c159c280350da8ddfafd83661abc3
parent 57a8eef8e39506611994cdbb919c68403a54dc78
author Xin Li <delphij@google.com> 1633683606 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683606 +0000

[automerger skipped] Merge Android 12 am: c928844735 -s ours am: a72b098d8f -s ours am: 0b5f115f23 -s ours am: f53eb6c5a4 -s ours am: 57a8eef8e3 -s ours

am skip reason: Merged-In I8a6be146994300bfcacb55ed125ba6f64d1c2d25 with SHA-1 ec20354f8e is already in history

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

Change-Id: I175e8b3a7248a2253f9d1318a5b1c4cc796dae72