tree ee4e576c15a787bffc1bc83149c754fc17950b20
parent 6c58d890f3a6993a3bcf413b84ba6fba875832f8
parent c2b652fd4d386b79dc99af249b6ad3844e53fdf1
author Jeff Brown <jeffbrown@google.com> 1383875245 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383875245 -0800

am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

* commit 'c2b652fd4d386b79dc99af249b6ad3844e53fdf1':
  Add media router service and integrate with remote displays.