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-03-06 19:55:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-06 19:55:48 +0000
commit7875f6851a09fcb233f9797fa735c71745096010 (patch)
tree20931fe76d257b1fd56fa256d5807307ae2b8aa9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent9a5663c787ea10ca395062517fd972bfbe15d0c5 (diff)
parent4ff4791b3d00e781001745f280a235b5f27605c7 (diff)
Merge "[automerger skipped] Merge "disallow changing from multi-sim to single-sim for carrier apps" am: 27c8f495f2 am: fbd7a667d1 am: eb410b36f6 -s ours am skip reason: change_id Ie422577e1f710b033ed85caed9a3e864aadff061 with SHA1 36ede9a2e6 is in history"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions