Skip to content
Commit 3bc9971d authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 

* commit '95d6e32b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
parents 9ee72b65 95d6e32b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment