diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 16:47:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:47:05 +0000 |
commit | e417cd980a9c843edb9faff1bf219d473847d89e (patch) | |
tree | 998ea7611528f1712d0deaab17fdeda6f6665660 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d385e4200e5f34c9aafa66264303ee35224b5e93 (diff) | |
parent | 43a5a0392ebe5fdb9653b7339a3de032be02542d (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: 08de4df29f -s ours am: 5a04b172a8 -s ours am: 43a5a0392e -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: I579ca38006158816efa17301666e881b0c793734
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions