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-05-05 18:29:35 -07:00
2009-05-22 02:16:08 -07:00
2009-05-22 02:16:08 -07:00
2009-05-26 17:47:39 -07:00
2009-05-26 17:47:39 -07:00
2009-05-22 02:16:08 -07:00