tree 5cdbaa4f00d65c16a76f991aa134fd4ec16df221
parent 9a05e846f3ac2f5c60f42160bcca37355647a3a7
parent 3105b6d2f192fc25f57911ef7bafbd62bae5b7e3
author Jeff Brown <jeffbrown@google.com> 1384149891 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384149891 -0800

am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev

* commit '3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
  Make quick settings show the standard media router icon.