diff options
| author | 2009-05-27 14:34:50 -0700 | |
|---|---|---|
| committer | 2009-05-27 14:34:50 -0700 | |
| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef (patch) | |
| tree | ed330500de06dc645769ea87372fb624390b52a8 /libs/ui/Android.mk | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a (diff) | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e (diff) | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'libs/ui/Android.mk')
| -rw-r--r-- | libs/ui/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index bf886a41049e..38ef8b9b900c 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -20,7 +20,6 @@ LOCAL_SRC_FILES:= \ LayerState.cpp \ Overlay.cpp \ PixelFormat.cpp \ - Point.cpp \ Rect.cpp \ Region.cpp \ Surface.cpp \ |