diff options
| author | Alex Chau <alexchau@google.com> | 2018-04-11 11:43:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-11 11:43:29 -0700 |
| commit | 24e358d117628eab9bb7d6ecff92f4c4bc6f04f1 (patch) | |
| tree | fadf2249f8d9a3501713a662d18f20f75d875d94 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f9b895b553b3e6ae1363fbd90538b6d235b13655 (diff) | |
| parent | de458dba2f6f550393b7d306d56959ef3908b2d0 (diff) | |
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev am: 87646514be
am: de458dba2f
Change-Id: I4c19926341e379bf98e971a991bca3f788a6fa6a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions