tree f9f2da89f594318d52caee6c775e87ac7f8f1c6c
parent 539f046a55b9de1a3fe5011c01f5457b30f2b22a
parent 60c221ccfaf67bdd9cadfd151d0bad9d3f8482ce
author Dima Zavin <dima@android.com> 1255562286 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255562286 -0700

am 60c221cc: am 5c328268: libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode

Merge commit '60c221ccfaf67bdd9cadfd151d0bad9d3f8482ce'

* commit '60c221ccfaf67bdd9cadfd151d0bad9d3f8482ce':