summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Jean-François Geyelin <jif@google.com> 2023-10-03 19:05:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-03 19:05:19 +0000
commitff4aaec1f10f7520edcdeb22075308ac6e335db8 (patch)
treee554bd229725502109d21b718858e2ba7136d144 /libs/androidfw/AssetManager2.cpp
parent0ad0bfa8491d2b47ec57689e9a0e3d31eac72661 (diff)
parent9352c08495d1f85129dddba3635705e3af0d76b0 (diff)
Merge "Revert "Throw an exception when using RenderScript ScriptC with an API level above 34"" into main am: 9352c08495
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769726 Change-Id: Idaaafc56fad4b674e43914236d11fedad4fe2edf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions