summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Josep del Río <joseprio@google.com> 2023-07-26 17:58:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 17:58:42 +0000
commit377f4a2f0faccd19a9e4875538fc0224ac1ff312 (patch)
tree78d9ff7edd0bc754bed64be02ef5add67db09e98 /libs/androidfw/ConfigDescription.cpp
parent5dfe9a2f216fc83dc39eaa0651fe7574b1bd0338 (diff)
parent8ca79e6ef76f3f88740cb291787605925d7e5710 (diff)
[automerger skipped] Merge "Fix KCM key mapping cloning" into rvc-dev am: 287bfd5afd am: b93914a7e7 -s ours am: 0a11e8a7c4 -s ours am: 044b07db4d -s ours am: 88601d2e85 -s ours am: 49d694bbc4 -s ours am: f5a4efb0a8 -s ours am: 15bd5fcb78 -s ours am: 8ca79e6ef7 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029386 Change-Id: Ic57b87ad031eabf65a92e9bb636ccddfb67e289e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions