OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c483071 dbd60a7)
am dbd60a71: am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Locks...
authorChris Craik <ccraik@android.com>
Thu, 20 Mar 2014 03:33:13 +0000 (20:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 03:33:13 +0000 (20:33 -0700)
* commit 'dbd60a71b5d7ac55a91ccd938121e133e17ed0cb':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help