am 96d14980: Reconcile with ics-mr1-release

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