tree 09f90db7ddaa8849cadc66d02ef70de1a94cc7a0
parent bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b
parent b1235a57a09174179553acecef2370354bdcbf41
author Xavier Ducrohet <xav@android.com> 1273675819 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273675819 -0700

am b1235a57: Merge "Hide two audio focus methods." into froyo

Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.