tree 2f14c49ad42c2509b99af80a1d82aab722a24308
parent c4f41a76b6bcdb26ccd6cdc424b508ac35521688
parent 78fd5010a87425d2be401d10a306dd68638fc1dd
author Mathias Agopian <mathias@google.com> 1271804397 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271804397 -0700

Merge "clean-up surfaceflinger a bit" into kraken