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

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6b78bd9323 -s ours am: deb6f81306 -s ours am: 1b3c1284f2 -s ours

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

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

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