diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 22:15:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:15:32 +0000 |
| commit | e93212d0a20ab90877dcfa27984b58cc4703a1d9 (patch) | |
| tree | 55adc7f17b68610eeea4275a2e015c2cf0faa0be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 112d4342dd45a815900779533964d7ea794e0c21 (diff) | |
| parent | ae509461ef21d43c52d0fe489614c2c54e0fae25 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792 am: ae509461ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: Ia4d5cfcaec12b493607fee85dff945f757aa816c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions