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