OSDN Git Service

am d38f8170: am 7066b888: am c864d952: am 61ebf9cd: Merge "audio service: make dock...
authorEric Laurent <elaurent@google.com>
Tue, 30 Oct 2012 17:14:56 +0000 (10:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 17:14:56 +0000 (10:14 -0700)
* commit 'd38f8170fa1c6c15e03a561e81f39faa8c7ff261':


Trivial merge