summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Kiran Ramachandra <kiranmr@google.com> 2024-01-25 19:17:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-25 19:17:11 +0000
commit79c36acce39f95d4d0bb7b9bd11bdd199789fe6d (patch)
tree2308e97362b34e31e37d92433e10559012c0c584 /libs/androidfw/AttributeResolution.cpp
parentac54640231dfe9eb49b9a4ec65eb1d096015ffea (diff)
parent6709de51c68486706cafc055aa05c1fac44b2158 (diff)
[automerger skipped] RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases am: 6219cbabc1 -s ours am: 9deb228c74 -s ours am: d77b0ff936 -s ours am: 3f0e3e4590 -s ours am: 6709de51c6 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25713742 Change-Id: Icb60b1adc5fd96cf95ead9751a35a280431ec226 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions