summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-11-27 18:43:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-27 18:43:32 -0800
commit8020c49368c2a9950e9f66092c6b07e46c5dac11 (patch)
treec0de117fb5aeaee6dc8de71f251a90e98c0a8d65
parenta10f9b0470f598c8edf0b11a7b4c78cdf7dd1f86 (diff)
parent5dd0a57f26c6c8dadc35454e69813145141386c4 (diff)
downloadframeworks_av-8020c49368c2a9950e9f66092c6b07e46c5dac11.zip
frameworks_av-8020c49368c2a9950e9f66092c6b07e46c5dac11.tar.gz
frameworks_av-8020c49368c2a9950e9f66092c6b07e46c5dac11.tar.bz2
am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
* commit '5d7b2778d0e9849fa601d722ec2efcee7d032d4f': New VHQ resampler
0 files changed, 0 insertions, 0 deletions