summaryrefslogtreecommitdiff
path: root/libs/androidfw/Util.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 14:57:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 14:57:19 +0000
commit42b17e74145bb28b4e2ac84dc96787dd31ae9703 (patch)
tree685a36bf485f25ca18942f12203bb3a88a3d7676 /libs/androidfw/Util.cpp
parent095ece0b3eefc0f05dac3ccfde1b5dc6c9b9bfdb (diff)
parent4c45ed4dd497afecc21471b7d0f8b9fc79c85e2b (diff)
Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 am: b6cff0c175 -s ours am: 54f95db1cf -s ours am: 68e3558965 -s ours am: 21837b3bc0 -s ours am: 0ad71dcc49 -s ours" into tm-d1-dev-plus-aosp am: 25988d9f6b -s ours am: 4c45ed4dd4 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19497893 Change-Id: I58eec8841e958b2068f9ab444c74315f1c915e71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/Util.cpp')
0 files changed, 0 insertions, 0 deletions