tree d953961bfe974581623869c3c54c6d5f3e74c69f
parent c03302d66c71f64a895dc09651a9d48569903f0a
parent 2b34a06f0ee6f0acdbf9b91a66909e2d9d1401b4
author Nicholas Sauer <nicksauer@google.com> 1412127728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412127728 +0000

am 2b34a06f: Merge "Fix MediaSessionManagerTest." into lmp-dev

* commit '2b34a06f0ee6f0acdbf9b91a66909e2d9d1401b4':
  Fix MediaSessionManagerTest.