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>2020-09-15 21:04:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-09-15 21:04:39 +0000
commitbfdffb8167ffddce10bfb62b6883c0021fd6ac02 (patch)
tree6661bf727aa27c801b26c076a4044cf3c17cb80a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent20c9ad9db815e6e282fcff29723f9de5c68985a1 (diff)
parent596541ce0ade25816e7424f7ef7336b875340dfa (diff)
Merge "[automerger skipped] Merge "Fix NPE when starting activity while no focused task" into rvc-qpr-dev am: 6c6907db9d am: f04f7e06c0 -s ours"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions