OSDN Git Service

am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
authorGlenn Kasten <gkasten@google.com>
Wed, 28 Nov 2012 02:43:32 +0000 (18:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Nov 2012 02:43:32 +0000 (18:43 -0800)
* commit '5d7b2778d0e9849fa601d722ec2efcee7d032d4f':
  New VHQ resampler


Trivial merge