From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 8 Dec 2011 18:21:41 +0000 (-0800)
Subject: Reconcile with ics-mr1-release
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fplatform-external-tinyalsa.git;a=commitdiff_plain;h=25bc6521;hp=8dd366f47258eeda07910a99b29ba681fe7464a7

Reconcile with ics-mr1-release

Change-Id: I4a3249fa2e8578bc33f5f01d221ab529e580fe97
---