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