OSDN Git Service

am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynam...
authorJean-Michel Trivi <jmtrivi@google.com>
Tue, 2 Dec 2014 17:25:24 +0000 (17:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 17:25:24 +0000 (17:25 +0000)
* commit '874e4502217aa48a06171a7d880b9ca571fd76b1':
  AudioMix address and type, rule exclusion API, dynamic source


Trivial merge