summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2024-03-28 16:32:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-28 16:32:45 +0000
commite1d503ba6b6ef79e0c1bb1412e125fcc1ed708af (patch)
treeb6aa3a47d158588433f86073a340d606ed0c5add /libs/androidfw/AttributeResolution.cpp
parent892098d62999dab8ecb73f3da4e0c330c489509f (diff)
parent521a25b8f5ae85ed5d7508a8d0d76b5bdd7c0425 (diff)
[automerger skipped] Merge "Revert "Update the enabled state with the current user state"" into 24D1-dev am: 521a25b8f5 -s ours
am skip reason: Merged-In Ic4f36ad4492c26314eddc3cd2c28a7bafd609a50 with SHA-1 961000c31f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26743166 Change-Id: I3f556b996bb67358fd0c8b66ca368b4dc67a1605 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