tree e1a224a6cfb0af068037491a02e562eaf371804e
parent 8495359382bc7c94a776e51c596e807448796476
parent 3d2d155a87cdd3038a2e6df8741181431cb250e1
author Jean-Michel Trivi <jmtrivi@google.com> 1257369780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257369780 -0800

am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair

Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
  Add new audio sources to support the A1026 recording configurations.