tree 6b9e3c09ccef421e93dd1e916a528b7de261a277
parent 37f271869ed9c9e9f0e7de7339017e0bb6719780
parent 7f5eb9fe3c10d8d83ff0e2b0fc60a05c2e6d5b02
author Eric Laurent <elaurent@google.com> 1418175187 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418175189 +0000

Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev