OSDN Git Service

am 4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)
* commit '4c7db154564031237df705641f27d504d4ae3f11':
  audio policy: apply default device volume


Trivial merge