OSDN Git Service

am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
authorDianne Hackborn <hackbod@android.com>
Wed, 15 Aug 2012 02:31:55 +0000 (19:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 02:31:55 +0000 (19:31 -0700)
commit977abbb887cfaf7cd8a0d31235281fbdd639ac19
tree161175fbbc63e0d691e2ad121fca20a10d3333b3
parentd54bc8009f745a5f730fa013bb0084c502b18aa9
parent48de12c5d1dc8d856724e8a1ec8288d9bfae40cd
am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"

* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on