diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 16:46:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:46:22 +0000 |
| commit | e158cdecd91277d9f4ef6838a31620fb95942d5f (patch) | |
| tree | 998ea7611528f1712d0deaab17fdeda6f6665660 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 11a3af10c90a7764abd4fee0a8ed8be3c4ebfbcb (diff) | |
| parent | 21a09d84b655b8fd9c777d116f043f933715f185 (diff) | |
[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: 0d15339d3a -s ours am: 21a09d84b6 -s ours
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 9516a007c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527
Change-Id: I8f91c56475db1c6dbf61de131ba7b5c69a65ea9f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions