OSDN Git Service

am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out...
authorDianne Hackborn <hackbod@google.com>
Thu, 10 Jan 2013 03:00:06 +0000 (19:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Jan 2013 03:00:06 +0000 (19:00 -0800)
commit854458f4d52937f9a1385559d759bd8019eb3294
treec221ae1f7f3fe87b64b8dfc3bb397f1a71cc5de8
parentd17792073fd3ab963bd5e0a7edcb312720fcea26
parent0287ca3ca36ad98004ddabfa189105e6324a820e
am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog

* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
services/java/com/android/server/am/ActivityManagerService.java