summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramVertexFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-11 21:04:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-11 21:04:10 +0000
commit2c26c551a9c39fd4436900c953305e54ff58994c (patch)
tree2915a926f886ccf47881a065071e450949fc345c /rs/java/android/renderscript/ProgramVertexFixedFunction.java
parentfc4955303987fd60e7760dbc594dde72658ac435 (diff)
parent1ceaf86ef6a3d3a1a8d15de35b04ae3482a95116 (diff)
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours am skip reason: subject contains skip directive am: e561e0fdbb -s ours am skip reason: subject contains skip directive am: 62fec618b9 am: 1ceaf86ef6
Change-Id: I77c6c7f17ea9bfaa96941f0429798107a84f619a
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions