diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 21:48:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 21:48:48 +0000 |
| commit | 2670006095512a48a98112cd4c2fa523891ed377 (patch) | |
| tree | 75eaefa91846d8c79237addd9924a03861121531 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 28314791ca03d505f058b8b05f81057aeb10ef5e (diff) | |
| parent | 01460b0bd8b5a0a921f506a338b8281c8055eb30 (diff) | |
Merge "Keystore 2.0: Integrate onLockScreenEvent." am: 01460b0bd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I968537c85edb1c92496657e8be23bc2a3d077073
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions