tree fb22822b6bb14c359fbc002e8d1be60db4ff57ea
parent 27e7f797c01a2be9316a977557f49e0379429d3a
parent 93430b3c6d170bf1db538c21666e0b508e8e48ec
author Michael Jurka <mikejurka@google.com> 1320255093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320255093 +0000

am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1

* commit '93430b3c6d170bf1db538c21666e0b508e8e48ec':
  Fix: never show recents over lock screen