diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:46:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:46:51 +0000 |
| commit | d385e4200e5f34c9aafa66264303ee35224b5e93 (patch) | |
| tree | 998ea7611528f1712d0deaab17fdeda6f6665660 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e158cdecd91277d9f4ef6838a31620fb95942d5f (diff) | |
| parent | 0e52618934f155af0a61db532010385d28e02738 (diff) | |
Merge "[automerger skipped] Merge "Tests no screenshot is copied when user consent timed out" into qt-qpr1-dev am: caef6680b2 -s ours am: f615871c45 -s ours am: 098e00c136 -s ours am: 626b2eeda6 -s ours" into rvc-qpr-dev-plus-aosp am: 0e52618934 -s ours
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 a898d11980 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527
Change-Id: Id4eecb377ecb14496bebe60534161343f0496d24
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions