diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-04 11:43:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 11:43:42 +0000 |
| commit | b685320ebab7fd6adfd9d20962aefa11f280ca02 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 72ac8b44a274b3d539ded09789eb144e34d8f182 (diff) | |
| parent | 170c66cbe732a7536e1d6eb1f63257454625e3b1 (diff) | |
[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: 452d7391a7 am: 25637b523a -s ours am: 170c66cbe7 -s ours
am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 ef7b1333f0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287404
Change-Id: Ia5e53e2602b29e6c78ae4743a9a921a448fcb3b9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions