diff options
author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2020-07-21 00:12:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-21 00:12:03 +0000 |
commit | 7c39eb6541ee2461e3e1f9817827e3df29c96c1c (patch) | |
tree | 1c9ecb1c70d9d989446685228c617822ad95f745 /rs/java/android/renderscript/ProgramStore.java | |
parent | 77ec48a8c2c784a9788697be9be1a890cab4ea1b (diff) | |
parent | c15812a8d966f838649f6b887b8e4ebb065864b1 (diff) |
Merge changes from topic "am-ef733261-fef6-484f-8cb7-9a11fea0ae44" into r-keystone-qcom-dev
* changes:
[automerger skipped] SystemUI: no PUK lock screen after 3 wrong PIN retries skipped: 3399ce1b0b
SystemUI: no PUK lock screen after 3 wrong PIN retries
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions