tree 7d0f7ca035d28794849b31df6f339e41ce6bee2c
parent 7cabd289a18c560c13295996364141b52376f792
parent acb57b13d726bf38868780a689113b603ee62cf9
author Eric Laurent <elaurent@google.com> 1285091547 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285091547 -0700

am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread

Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.