tree 79f50efe67f1cb7c12ec6ac1ab6c8822393fd645
parent ae104eb6c6073a3da25bb59f0d1b92165fe20e72
parent afd899c61fb637528310110cb1ca17d793a97548
author Jean-Michel Trivi <jmtrivi@google.com> 1409960765 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409960765 +0000

am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev

* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras