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