diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:26:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:26:43 +0000 |
| commit | 44a0c1854d2ba5024617e9fc3e92b1386bc93925 (patch) | |
| tree | 5c3c34049146e496d8fbeb28023866ecc1b61477 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67236850f5fb9f976b9ac5b0a9eaabb89dd6741f (diff) | |
| parent | ddb1194d7d00d4e0884c5afb6e5b6f92416d6b4f (diff) | |
Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours" into rvc-dev-plus-aosp am: ddb1194d7d -s ours
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 8f3de48e19 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171287
Change-Id: I7f69f6b1b1c4688deee8df9c883f9cf3c2700d8e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions