tree 202d81e69b65772097cbbcbe664f1b6ce8529a72
parent bad1d933efa1ebac1262377d07a0fe1869a8357c
parent 1c1a36cfa59a48f5f07d48dfa191d0394cf7ff9e
author Jeff Brown <jeffbrown@google.com> 1368491935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368491935 -0700

am 1c1a36cf: Merge "Update media router API." into jb-mr2-dev

* commit '1c1a36cfa59a48f5f07d48dfa191d0394cf7ff9e':
  Update media router API.