summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-11-17 18:52:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-17 18:52:37 +0000
commitfcf66c36d862b5fd759b5526dfea392b3b82c9d9 (patch)
treeea0ccd0a942c4309ef02321064d71b0fcedaf41a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent349f9002e441923ec4e99ebe7dfd326bdc708bf1 (diff)
parentd45305b25c434c5a2bcf6faef440862bd9cd760f (diff)
Merge "Restore preferred activity filter if it not inside" am: d8c6106f91 am: d45305b25c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483964 Change-Id: I62a1c68a761d515c7cbccc3868bf91def5fb9d7c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions