tree 819e7a2456acd7b6b851efd97361023b168c1562
parent 2b9f9186fa4b4e336f9d889b66da757c985c2f04
parent 5d0b18cddfcb933d7960c5a6a820045d77a0285c
author Jeff Brown <jeffbrown@google.com> 1384504797 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384504797 -0800

am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev

* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.