summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Matías Hernández <matiashe@google.com> 2024-09-05 17:47:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-05 17:47:55 +0000
commitcfed4799ae4f72618328250aa7a0090ea0cc29cb (patch)
tree1caebbf20ea6686545bf87389150c87eda5e77f0 /libs/androidfw/AssetManager.cpp
parentc4ecd8fbeb50c98448af1368b5cdd738b5614566 (diff)
parentc17d8088ed43cd3ef09e5894aa4a789679b07f80 (diff)
[automerger skipped] Revert "Check for NLS service intent filter when rebinding services" am: c17d8088ed -s ours
am skip reason: Merged-In I6ba585d123fbe88cbff2011b62f02774dd1efda5 with SHA-1 f6515cca9a is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28760115 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29139479 Change-Id: I256b2b46b016aca87fe24c828b50c0415aab3f64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions