OSDN Git Service

am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SH...
authorCraig Mautner <cmautner@google.com>
Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)
commit02c7ba73e8733def289535b6d13dc6a504a0443f
tree6a1629d20b82b211d1488d23cf5be4d8f412fd83
parentc53ad4cd807e74897ba2d7b799cb8ff6824b34e8
parent41bb0637ca430808ab40a0300467ea58ae0a05c3
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 '41bb0637ca430808ab40a0300467ea58ae0a05c3':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java