tree 3ac2f1df4895cc1da9537341b13ed42762f6c592
parent ebad184047143b8439e4ce1bd80dacb8d0573e0e
parent 8fe26ff7c76fb0c80c41c603b384d63814da97f7
author Eric Laurent <elaurent@google.com> 1285200288 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285200288 -0700

am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread

Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'

* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
  Request permission for global audio effects.