tree 1ead2551061659bbba2a905ab29e06a4ba986973
parent dc18ce783fa10466d15ec74be38d38555c4750c6
parent 74e19f572a598ce907661ed2f5127319f8d7c635
author Craig Mautner <cmautner@google.com> 1395778268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395778268 +0000

am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '74e19f572a598ce907661ed2f5127319f8d7c635':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs