diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-09 17:55:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-09 17:55:12 +0000 |
| commit | 0577d83cd3279e4d097f0f48aa8c124a12824b69 (patch) | |
| tree | cb1a0356bdbba1feaf6287140930ac09669d63a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 526abec2f6c9d94edcb070d6eba00be90dfe2efc (diff) | |
| parent | dc19333bf50bc746f71e15c053fceca186ffe70b (diff) | |
[automerger skipped] Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a7c am: 3d3e16e2a6 am: a95dc0e13f am: dc19333bf5 -s ours
am skip reason: Change-Id I8b8ab1442c3f592a4e3ce70852025b1b169d5f18 with SHA-1 98c242f64b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454737
Change-Id: I9b89870eedc347257139aca1ced6ba2e4ebe76de
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions