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-12 22:56:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-12 22:56:23 +0000
commit89a5dbf1622de7be83282f16a279bd1b4b1c0ffb (patch)
tree4c8bdf9e51b38932924972acf3a80dbfe0df6c96 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent3b9b86e0d9a962d3bc70f645d604e3ee35d29165 (diff)
parentbd5c7d5b4277cb3fe755e7a464e6af2a2dd604b3 (diff)
[automerger skipped] Merge "DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event." into qt-qpr1-dev am: 98e8a9e301 am: bd5c7d5b42 -s ours
am skip reason: subject contains skip directive Change-Id: I36727f38152dea2d4d8207b3b791d998f1c242e0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions