summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Alice Wang <aliceywang@google.com> 2025-01-09 07:13:57 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 07:13:57 -0800
commitfedf80694722bd14531d953380872063d72d1fa9 (patch)
treee9def66f26f50e62b354febe7466650001c43601 /libs/androidfw/AttributeResolution.cpp
parentc191e9a783a007a0e1642cb3197544376ec20d86 (diff)
parentc4e25aebfa2f257845e3b35c05b62472ac7f0459 (diff)
Merge "[java] Restore ServiceManager#checkService() to return IBinder" into main am: 4109b47910 am: c4e25aebfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3432304 Change-Id: Ice0fd085db90e7743b17f0916404e5403612de2a 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