| commit | 743cfba7e298e2ff10baacf7c8cfec9eceb08a15 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Mon Aug 28 16:47:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 16:47:44 2017 +0000 |
| tree | 15754a0aad962faf02e7373d058b67026bec291b | |
| parent | a76da9e67dbe3a595ed4eccee25ac53a7ca16eb1 [diff] | |
| parent | 3be893e449d451621eae8fb64b23ee85f65c56ce [diff] |
Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2 am: 3be893e449 Change-Id: Ife6cd6b5772df03f0511c42b635984e840496626