| commit | 5eb898e7524b35b69b18e77aa9860715fbcdb9e0 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Dec 10 21:59:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 21:59:56 2014 +0000 |
| tree | c33bbdf9c011dcc8e7cd4956ae582762e8a8261e | |
| parent | cb05679a18f9ff0a6f739f5aae5f6ba345d67951 [diff] | |
| parent | 9e5e1cf2bb62d6cfc6d97191c92848a610b3a4d9 [diff] |
am 9e5e1cf2: am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev automerge: 24ca556 * commit '9e5e1cf2bb62d6cfc6d97191c92848a610b3a4d9': NoMan: Apply audio restrictions when effects are disabled by listeners.