Merge branch 'va_backend' into PO 64/564/1
authorAustin Yuan <shengquan.yuan@gmail.com>
Wed, 28 Apr 2010 23:20:56 +0000 (07:20 +0800)
committerAustin Yuan <shengquan.yuan@gmail.com>
Wed, 28 Apr 2010 23:20:56 +0000 (07:20 +0800)
commit1f4d9627ffd6594380f67ee1085c7aa132397e6b
tree3fd287e06fc6fc3563d17ef007055766f4f57521
parentbe467652b91634b7f6c8989a78c25469ffc1827e
parentc4a03c1016cd41e22ecc3410be6759aa0e1a71cf
Merge branch 'va_backend' into PO

Conflicts:
va/android/va_android.c
va/va_android.h
va/va_backend.h

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
va/Android.mk
va/android/drmtest.c
va/android/drmtest.h
va/android/va_android.c
va/va.h
va/va_android.h
va/va_backend.h
va/x11/va_dricommon.h