diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2021-03-03 18:29:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 18:29:55 +0000 |
| commit | 2b76e792ac20d933db96fca76cf183baf03d3ffa (patch) | |
| tree | 0ac1a5601e9d9405f76895ae6ea45bbc0d4d6347 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e92c3fae6bcd3774b5bcd4b16d7ae2956dd55772 (diff) | |
| parent | 3e8e6c60b69f9001e95a65c6518883256758cbad (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7 am: b4bb7d1720 am: 3e8e6c60b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6ec99f1b6ef26b5ce53d4f627b1e62dbeddaaa7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions