summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Kiran S <krns@google.com> 2024-05-21 04:17:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-21 04:17:20 +0000
commitc69f7542e010643bacbbe04d2deec308b580f0da (patch)
tree82001b26de84ee6080ce71774f8c1fca6c60ded9 /libs/androidfw/AttributeResolution.cpp
parent560431c148dfc87f836c4f9cbf91f46ee5dc4113 (diff)
parenteac7a437781dab754cb6967146a96fa35e1ba6ac (diff)
[automerger skipped] Merge "Restrict USB poups while setup is in progress" into udc-dev am: 146afcc2b4 am: eac7a43778 -s ours
am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 80b67340eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27316786 Change-Id: Ib0feb5d586538d0e98518a5087af3d4312b4dcff 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