summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramVertexFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-09-25 21:05:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-25 21:05:41 +0000
commitc84de559413ac83730822268b9960c796391b746 (patch)
treec8914b42f690f9e2dd527d35b45345b4b37ff28f /rs/java/android/renderscript/ProgramVertexFixedFunction.java
parenteccf86be7fb1ef623f91a4348bec07426eddf4e9 (diff)
parentf4f28534762b04ee7e0504ff2b21f89838d8a273 (diff)
Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89 am: 2f373bfb5f -s ours am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1 83c87e50b1 is in history" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions