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

Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
  Made audio effect control panel intents public.