diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 11:45:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 11:45:26 +0000 |
| commit | 4ba8aa407fac9a749bcfe56ceb7b009fdf49d371 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a780c3da8edf4c9e344ea0cf184c6b857ea972c (diff) | |
| parent | 89dc04ff76db168ba1319a30a0b38b657038db4a (diff) | |
Merge "[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: c0f911ce35 -s ours am: f3c3d9fa63 -s ours" into rvc-qpr-dev-plus-aosp am: 89dc04ff76 -s ours
am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 f21c885ca7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287404
Change-Id: Icba5b7f3283e74a78760e5d98b2598195e0bb286
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions