summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2022-03-16 21:01:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-16 21:01:06 +0000
commit886bacc00488a584cc09c74a02721cbee3309338 (patch)
treeee27fd61e13844f28ff3e9e7c8a19107a758875a /libs/androidfw/AttributeResolution.cpp
parent30ea8d10840d099e25164fe1fba93daf82621fa6 (diff)
parent3acea602751f44970a1700bb74ef257792c09ab7 (diff)
[automerger skipped] Merge "Revert "Disable pointer authentication in app processes."" into sc-v2-dev am: 3acea60275 -s ours
am skip reason: Merged-In I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 69538cf7f3 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713103 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17214406 Change-Id: I150cb278d53a710599d342e618d4f6b8a6a33c56
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions