OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 433a768 0b0a5dc)
am 5437c220: am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later...
authorJim Miller <jaggies@google.com>
Tue, 10 Jan 2012 18:37:51 +0000 (10:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jan 2012 18:37:51 +0000 (10:37 -0800)
* commit '5437c220e239dc6276942990bc81c1388cfb176c':
  Fix 4560303: Add setting to lock later when power button pressed


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