summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorSterling Huber <hubers@google.com>2020-07-29 22:36:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-29 22:36:08 +0000
commit5b12be15622005500732b1a42becd407e51e7608 (patch)
tree1e1375194bfde54669ede8a04e54b472417112a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent32cbeeaf96f146d6513512078ccf36d7d04d993d (diff)
parent92ffd8ab349326ed5e000e299146a1d10c796f8c (diff)
[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours am: bdda889b15 -s ours am: 92ffd8ab34 -s ours
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11003608 Change-Id: Ib8a717ca6b49a630e94df24fae34219bdcb22432
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions