tree e95ae26c26968132db51a8b89146bec579ee93b6
parent e3ab0e8615b6c9a3fdfc569eed453105f7e3c92c
parent b9327016b4c0ec354dd034ca8900fa428ce95896
author Xin Li <delphij@google.com> 1656551066 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656551066 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 465b8b38a1 -s ours am: 482bc92ea6 -s ours am: 22f432ec3c -s ours am: b9327016b4 -s ours

am skip reason: Merged-In I2c5864f2229b9e990e04875d22666cf831a9c234 with SHA-1 480522bbf6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/parameter-framework/+/19094707

Change-Id: Ib0c50a14dec2bdf0b27fa5311f59f8d615e8ab09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>