OSDN Git Service

am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs...
authorCraig Mautner <cmautner@google.com>
Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)
commit3bc9971d707839f2d26e601082d654242295002d
treeb9a99515a6fc86be511a090f107ed1125172073e
parent9ee72b65436242ab4f8f4ceb904ea5078779416c
parent95d6e32bc3c5382740a6bb418f77cf7147d833f7
am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs