diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 22:15:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:15:06 +0000 |
| commit | c8e009af4c3b0c57d4a4eaf55cfefe47ce59ba7b (patch) | |
| tree | 55adc7f17b68610eeea4275a2e015c2cf0faa0be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a23def8f6b8d5a89eb930e15901cacb0bd5fd9d7 (diff) | |
| parent | 51589532efb97723d10dca829e56f4c014fa3b82 (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: 51589532ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
Change-Id: I8683c301d505327ca81cadb9539225322d1cef09
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions