diff options
| author | Chris Craik <ccraik@android.com> | 2014-03-20 02:35:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 02:35:47 +0000 |
| commit | 99689a6874c7c465ed97dba625d38e3f1599963f (patch) | |
| tree | fc73460cdd54a3da06a107714d91c7249170358b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 857fe511fe7139a41ad3d587a73758be53340e90 (diff) | |
| parent | 9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a (diff) | |
am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions