tree 65c9d53a8ca4b9c1be2a7b4158b87266f8d52f41
parent fdb33a08266d95c338c141446c1da09108194281
parent 7fbcac6a03db6d09ab3816738754a64f62de22b9
author RoboErik <epastern@google.com> 1417715622 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417715622 +0000

am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev

* commit '7fbcac6a03db6d09ab3816738754a64f62de22b9':
  Tweak the behavior of the MediaSessionStack