tree fc25eba4605509dc9a9a8678ef2f1d8654f40a0c
parent 991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09
parent 69551d85e95d2ba712f083b39f3ff0b32f865e34
author Brian Swetland <swetland@google.com> 1251934159 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251934159 -0700

am 69551d85: Merge change 23557 into eclair

Merge commit '69551d85e95d2ba712f083b39f3ff0b32f865e34' into eclair-plus-aosp

* commit '69551d85e95d2ba712f083b39f3ff0b32f865e34':
  init: add some more audio devices