Merge commit '7422163dfcbad4997d30274bb7c438997269ae4d' into eclair-mr2-plus-aosp * commit '7422163dfcbad4997d30274bb7c438997269ae4d': gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO