OSDN Git Service

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


Trivial merge