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

am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:... 

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 '02c7ba73':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
parents 759445c5 02c7ba73
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