OSDN Git Service

Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Tue, 2 Dec 2014 17:09:28 +0000 (17:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Dec 2014 17:09:30 +0000 (17:09 +0000)
commit57457b98cfec197283c42585a3bc4abb1b21d05b
tree261acbb771ee47108eb05abac898eb04b280b6ec
parent81defc6a840367dcf9591d14b827f2d8d756ef00
parent1b3541d5eedb332ea01066b4a78a2d06d5304044
Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
media/java/android/media/AudioManager.java
media/java/android/media/AudioService.java