| commit | 3be893e449d451621eae8fb64b23ee85f65c56ce | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Mon Aug 28 16:38:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 16:38:41 2017 +0000 |
| tree | 9eb15174f4a2c048f20fdbf7c9e82f5a392e6cb8 | |
| parent | de0bdc59e1acadf84666c754b680bfd67e1091e6 [diff] | |
| parent | 72cf1a4fa29fbd75ca3e7e49165936f7fa8ccfb1 [diff] |
Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2 Change-Id: I27394a0801a9d5d31d4ac18b3b773268b6d2fa10