summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ScriptIntrinsicBlend.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2021-03-25 23:04:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-03-25 23:04:51 +0000
commit41f6cdbc0c75f82b8cac8d767ac10df52ccafb8a (patch)
tree1c1076f7483e839ecc2e47724ecdf13bcea8cff6 /rs/java/android/renderscript/ScriptIntrinsicBlend.java
parent01af039be893ebbd9e3053fcb16129f3711c3c9d (diff)
parent5a94e30073039adfc7ef7abe9056db183f4715fb (diff)
Merge changes from topic "mar24b" into sc-dev
* changes: Preserve implicit split-permissions on clear. Replace BLUETOOTH and BLUETOOTH_ADMIN permission checks in BluetoothManagerService.
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicBlend.java')
0 files changed, 0 insertions, 0 deletions