OSDN Git Service

am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled...
authorEric Laurent <elaurent@google.com>
Tue, 30 Oct 2012 00:14:59 +0000 (17:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 00:14:59 +0000 (17:14 -0700)
* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
  add settings for dock audio enabled


Trivial merge