diff options
| author | Dan Sandler <dsandler@android.com> | 2014-09-26 19:43:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:43:16 +0000 |
| commit | b30ea7f62c384962cbd1c005712d91dbc2aa9e91 (patch) | |
| tree | dce3183dcc5322614bbe8e737672cf84fdb6bfd7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6f65a96ca11c98a3feb9046f2e3c8af1779c0cd1 (diff) | |
| parent | 22ef3ed3055ff668089853bd6e1e685a2e4cef45 (diff) | |
am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev
* commit '7b7ef437e5b46d1173a7458ada6520778284c91a':
Don't start the keyguard until boot is done.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions