tree fce3ed5277814dff8d4ca366ebe7b27618fa8f64
parent cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7
parent 4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be
author Craig Mautner <cmautner@google.com> 1395768964 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395768964 -0700

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 '4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs