OSDN Git Service

am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to...
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 12 May 2010 14:55:25 +0000 (07:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 May 2010 14:55:25 +0000 (07:55 -0700)
commit9496e90287b7cc76296970af52637425d8c20af1
tree8a093c05800b77519a2cc7592aa0c0da2f1617e8
parentc36408479d4b08fc53bccf9b9b5f4515ec921c99
parente2eceb0ef48874edaded901263ab8b366e32917d
am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken

* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
  Update javadoc in android.media.AudioManager to not hide the