tree f989bbad90b17ce2d214549f647168736e8842d0
parent 9079259054359e45b9616afaa799439c9171c0e2
parent 05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3
author Eric Laurent <elaurent@google.com> 1419010083 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419010083 +0000

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

* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
  AudioService: fix permission check.