OSDN Git Service

am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album...
authorChris Craik <ccraik@android.com>
Thu, 20 Mar 2014 02:40:14 +0000 (02:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 02:40:14 +0000 (02:40 +0000)
commitdbd60a71b5d7ac55a91ccd938121e133e17ed0cb
treec0900af14ce7e9a2b6b858c2ada5f290cdcd6a60
parent244d18bfb3ae7ff9781616b35e29ffb84713ef68
parent99689a6874c7c465ed97dba625d38e3f1599963f
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
packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java