tree 3f294c0fb421646dcad9c8aba3171969e28503eb
parent 32c7e64b407c1861733d9fa4312ba3bb4713a825
parent a6286c36406f6bb21b53d92dc165c603365b358b
author Mathias Agopian <mathias@google.com> 1243460090 -0700
committer Mathias Agopian <mathias@google.com> 1243460090 -0700

Merge commit 'goog/master' into merge_master

Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp