diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-10 21:57:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:57:35 +0000 |
| commit | 7a27bc3a761d1b3720f994690da7b4fd079e6624 (patch) | |
| tree | 5ac2cfab1e5b96101c1ce2091a1f67db8962f3e7 /docs/html/sdk/api_diff/13/changes.html | |
| parent | 38b5d057f08a1a05df44f94de1053f74739c6677 (diff) | |
| parent | 093789755e5549bd8676d268a6f69b1d6db5026b (diff) | |
am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
AudioSystem JNI: Add audio policy custom mixes registration
Diffstat (limited to 'docs/html/sdk/api_diff/13/changes.html')
0 files changed, 0 insertions, 0 deletions