summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorNazanin Bakhshi <nazaninb@google.com>2019-03-06 11:52:08 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-06 11:52:08 -0800
commit4ff4791b3d00e781001745f280a235b5f27605c7 (patch)
treef7ba73712230b70b23fdd1bbf1cea04e56dc1f32 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentf2f31c212be0a410de59b8ba06bfd94df2c503ce (diff)
parenteb410b36f6f16755afc2ce595c31cb5917f720df (diff)
[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 Change-Id: I91fe3b707532b9cf1f918254259a257affeab8a5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions