tree 15754a0aad962faf02e7373d058b67026bec291b
parent a76da9e67dbe3a595ed4eccee25ac53a7ca16eb1
parent 3be893e449d451621eae8fb64b23ee85f65c56ce
author Jean-Michel Trivi <jmtrivi@google.com> 1503938864 +0000
committer android-build-merger <android-build-merger@google.com> 1503938864 +0000

Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2
am: 3be893e449

Change-Id: Ife6cd6b5772df03f0511c42b635984e840496626