summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-23 06:21:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-23 06:21:59 +0000
commita37eb5be43a848f53d9b55dd48d4f1e6b1a04285 (patch)
tree2ac9ae7a5edf02ca3aecc516383d505b67d21219 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentf67e03b7a85d4283bc29845c0b43a92b018d5527 (diff)
parentecc0fce03b669e02a093443f5128bbb10469971d (diff)
Merge "Add READ_PRIVILEGED_PHONE_STATE to the settings whitelist" am: 62a1827a74 am: ecc0fce03b
Change-Id: Id6e1be7065f08eb917109b59b3c9e57a9f390322
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions