tree 029d4f2ffb0d00806056303fd20fa1585b8d043f
parent 2bced6dcb53c1743d6d11ffcb213206a07a63737
parent 1907c0d280d97776708810c9d24931aa6f818790
author Jim Miller <jaggies@google.com> 1384482053 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384482053 -0800

am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev

* commit '1907c0d280d97776708810c9d24931aa6f818790':
  Don't show external presentation until keyguard actually shows