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-13 19:12:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 19:12:08 +0000
commitb2c4d1dba50cc57abbc3219055932ef187ef5d72 (patch)
tree4c3828a6883446c2d319b0dec656a0d5cf2c7fd2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent42b65fdd8b04a6bd5ff98fa4094594863c3d8954 (diff)
parent3c2fdd68056f41fb2deee653545c02a4f5a7527b (diff)
[automerger skipped] Merge "Do not get CM instance in getActiveModemCount unless needed." am: 31bbebe179 am: 94486daaa2 am: 3c2fdd6805 -s ours
am skip reason: Change-Id I7a90ec45a0a3700a0c6852c505d68f438f26768c with SHA-1 8a4cf5e0e3 is in history Change-Id: I890db3c4b193403177221576ed12321a50f1398f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions