tree 4490dcec1420a23271655221ec11d2c17e174989
parent 071ed3348739cb3f2bb9ef169067440c8c61b881
parent 09829b71de3a84cb9d1bc0d8aad78dd16daadddf
author Adam Powell <adamp@google.com> 1340256944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340256944 -0700

am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev

* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
  Expand volume APIs for MediaRouter