tree 75bb2edc3b2c7293513fb622b17a5c45bc7f8047
parent 40c81e4a5d96f8a3853045b289f6131c44d3155d
parent 5773f72457246e437c24624cda8ec2a869165ee8
author Jeff Brown <jeffbrown@google.com> 1384149894 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384149894 -0800

am 5773f724: am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev

* commit '5773f72457246e437c24624cda8ec2a869165ee8':
  Update the media router dialogs and integrate into system UI.