OSDN Git Service

Merge commit 'goog/master' into merge_master
authorMathias Agopian <mathias@google.com>
Wed, 27 May 2009 21:34:50 +0000 (14:34 -0700)
committerMathias Agopian <mathias@google.com>
Wed, 27 May 2009 21:34:50 +0000 (14:34 -0700)
commit723ec00af46d1f95d69fe5af53e0a5d09f01a7d6
treeef596c117b8f11f8025770c52baeac04b2e4551a
parent310f8da0c3122ed5419db8f12a6e98d3188325b2
parent39afd5f7daaa525adaf38caf4a48d2cb22e0a41d
Merge commit 'goog/master' into merge_master

Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
include/binder/MemoryDealer.h
libs/ui/Android.mk
libs/ui/ISurface.cpp
libs/ui/ISurfaceComposer.cpp
libs/ui/ISurfaceFlingerClient.cpp