am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media  Change 1 of 3 Notes from API Council review:   Rename onAudioFocusChanged -> onAudioFocusChange" into froyo

Merge commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1' into froyo-plus-aosp

* commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1':
  Fix bug 2553575 API REVIEW: android.media  Change 1 of 3