OSDN Git Service

am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into...
authorJason Monk <jmonk@google.com>
Wed, 23 Jul 2014 18:51:26 +0000 (18:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 18:51:26 +0000 (18:51 +0000)
commita6de67773b00aa2dd348bf8e3ddbf6b6cc862ff5
treee0dd2743199a96f0420adb48785a3255760d306a
parent7c7c448499ad8dc342268fb1b36634ec3517a99c
parent8ed4d5ac664f2442c9fd9d9861abd6d589dac73b
am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev

* commit '7143b71c9daf0ed4e73eabd190a445f14d9eafc0':
  Make the 'locked' lock task not lock keyguard on exit