tree 630acd50f2eb1fbca0bffa5ad3fa0e913f9654a6
parent 7f8758cb28bdf53a04a390e185457bb09b2cf438
parent 278aaed1eb37763f7dcb2364523db591014a9210
author Marco Nelissen <marcone@google.com> 1303805069 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303805069 -0700

am 278aaed1: Merge "Backport audio ducking from Honeycomb" into gingerbread

* commit '278aaed1eb37763f7dcb2364523db591014a9210':
  Backport audio ducking from Honeycomb