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

..

config

…

java

Merge commit 'goog/master' into merge_master

2009-05-27 14:34:50 -07:00

jni

Merge commit 'goog/master' into merge_master

2009-05-27 14:34:50 -07:00

res

Merge commit 'goog/master' into merge_master

2009-05-27 14:34:50 -07:00