commit | 72cf1a4fa29fbd75ca3e7e49165936f7fa8ccfb1 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Mon Aug 28 16:27:27 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 28 16:27:27 2017 +0000 |
tree | 70c46da6fdfc16fb8d64fdd717c6ddb7a72d5c69 | |
parent | b6cf7076321683b53535f2c3a46dbc9b8fedba73 [diff] | |
parent | 26ae15f48739d890f2adc6f3a5aa5b877ad21a3a [diff] |
Merge "AudioManager: permission annotations" into oc-mr1-dev