diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 22:35:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:35:32 +0000 |
| commit | 79677ee4699fc20fd88b6b477730984428bccfa8 (patch) | |
| tree | f8ef0a30a95e64ad0da6f85a2803cbd6d03ca4a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5aa65e4e2923c22b0bb8122ae2a7ffe22334b4b1 (diff) | |
| parent | c9534f61b520626075748d84d59d44d02ceae82d (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13 am: b474d2cb17 am: c9534f61b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
Change-Id: I44007722d81abe54262dc4ca4ee25110e8418796
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions