summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2014-03-19 19:24:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 19:24:53 -0700
commit00efaea980c7a9f84f326b22aef740cb5438d282 (patch)
tree996d58801f25a52b14c4b04544833ee7af1a5a77 /media
parentdd6b7495577eca7a00aa37bfdca3449cf1443681 (diff)
parentdac298005ce3c1361e27bb740e4b518765d43d77 (diff)
downloadframeworks_base-00efaea980c7a9f84f326b22aef740cb5438d282.zip
frameworks_base-00efaea980c7a9f84f326b22aef740cb5438d282.tar.gz
frameworks_base-00efaea980c7a9f84f326b22aef740cb5438d282.tar.bz2
am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit 'dac298005ce3c1361e27bb740e4b518765d43d77': Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions