am 673253ac: tinyalsa: Add PCM_NORESTART flag.
authorJohn Grossman <johngro@google.com>
Wed, 4 Apr 2012 18:31:16 +0000 (11:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Apr 2012 18:31:16 +0000 (11:31 -0700)
* commit '673253acf06838bb24d0b0b1a3962bed573855b8':
  tinyalsa: Add PCM_NORESTART flag.

1  2 
include/tinyalsa/asoundlib.h
pcm.c

Simple merge
diff --cc pcm.c
Simple merge