tree e15b6f8c25fd4d5fa549380fe7981c27f15094e6
parent 3d02ab8c49b4d77d4b7458fe2cf6c92c9fb9f7f8
parent 34cbbc9fb95b6c66840edce3291ce8275a290efb
author Mathias Agopian <pixelflinger@google.com> 1271806645 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271806645 -0700

am 827cda45: Merge "add support for up to 16 buffers per surface" into kraken