am cfd1b547: am 65eba62e: Reconcile with ics-mr1-release

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