summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-22 13:34:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 13:34:48 +0000
commit8b584bda41c553914251f53bbcbad8edbec05932 (patch)
treeeed22b4f42290f2b2d3798c0e0f0bf974259ada9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentb51ed970f004ebff2293b4615206d4031f517b57 (diff)
parentacd4cbe1d9563da57b210fede3075167f01700b7 (diff)
Merge changes from topic "am-04c3ade2997f463f99e7d6e99506ddc2" into qt-r1-dev-plus-aosp
* changes: Merge changes from topic "b_132890298" into qt-dev am: f581d1b92f am: d0151ddb4a Add command line utilites to set the reason field in incident report header am: 5dfe3dfeb8 am: 0661c595dd Add ProtoOutputStream.serializeToVector am: dcd64522f4 am: de7a0a3362
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions