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