tree 9bad1175100a49eb43ca7638ef74dcbe250de866
parent 87343eff543a127c29e0fa47c9c276b3e9b92d57
parent 8d24fe235a6e8f44e32a56a05ab36ed5b35385df
author Eric Laurent <elaurent@google.com> 1419009574 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419009574 +0000

am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev

* commit '8d24fe235a6e8f44e32a56a05ab36ed5b35385df':
  AudioService: fix permission check.