tree 257e3dcf4801f649618a44c453253c016d953903
parent 2fbecbad88f0c6298c35a5bc1bf87aa244059754
parent 85f8faa65754011161f40b2047fa19a6128ba88c
author Eric Laurent <elaurent@google.com> 1352418481 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352418481 -0800

am 85f8faa6: am a7c17deb: audio policy: notification delay - DO NOT MERGE

* commit '85f8faa65754011161f40b2047fa19a6128ba88c':
  audio policy: notification delay - DO NOT MERGE