tree b65d6a2f252feba6d38887fee1e738d4c9308d81
parent 1067eec9d124bef68cce022463205e28ea94257a
parent 7fe53f9a0dc22292290ade84b6e1664ae1a18725
author Mathias Agopian <mathias@google.com> 1273710987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273710987 -0700

am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken