From: Glenn Kasten <gkasten@google.com>
Date: Wed, 28 Nov 2012 02:43:32 +0000 (-0800)
Subject: am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
X-Git-Tag: android-x86-4.4-r1~23^2~391
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8020c49368c2a9950e9f66092c6b07e46c5dac11;p=android-x86%2Fframeworks-av.git

am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp

* commit '5d7b2778d0e9849fa601d722ec2efcee7d032d4f':
  New VHQ resampler
---

8020c49368c2a9950e9f66092c6b07e46c5dac11