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