OSDN Git Service

am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Status...
authorJim Miller <jaggies@google.com>
Tue, 6 Dec 2011 06:14:37 +0000 (22:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Dec 2011 06:14:37 +0000 (22:14 -0800)
commita3e3c4dd37139615adb88a38e6a99402e0cfcd2b
tree9070696ef70324f861fdb2de6f2a21fd64ced7f0
parent2eb4a5ee5bebf4120de217adf5a9f72b0c94951b
parent17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1

* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar