am 25bc6521: Reconcile with ics-mr1-release

* commit '25bc6521d0f0753251c4be84dd395c6cbebc83cb':
tree: d6ea6bebf4f5a4af0f78316396b1e7b45f8a3d22
  1. include/
  2. Android.mk
  3. mixer.c
  4. pcm.c
  5. README
  6. tinycap.c
  7. tinymix.c
  8. tinyplay.c