tree ef596c117b8f11f8025770c52baeac04b2e4551a
parent 310f8da0c3122ed5419db8f12a6e98d3188325b2
parent 39afd5f7daaa525adaf38caf4a48d2cb22e0a41d
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