Mathias Agopian 2da99bdaa1 Merge commit 'goog/master' into merge_master
Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp
2009-05-27 14:34:50 -07:00
..
2009-03-03 19:31:44 -08:00
2009-04-24 15:00:41 -07:00