diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 16:03:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 16:03:44 +0000 |
| commit | fe0e3e345451fc5775df118a23d142b0dc761b1d (patch) | |
| tree | a6bc213420729cfd766acfbaf2d8cdee941dbf59 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b406329f6baf8d4a20082dffc1919c4c51e3d226 (diff) | |
| parent | 4d117fd3808176f54ce217c10a045538bf29f4f4 (diff) | |
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: I4108c04cf69a9295c42cd34192b1770de9ac8a3e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions