summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-09-08 10:38:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-08 10:38:41 -0700
commitcfa590392660fc4a50dc90c456d1fab69e6e0662 (patch)
tree35edfb25aa51ab010cd62fdb08cca685c69fc9a4 /core/jni/Android.mk
parent7e0598d066e58ad9cadbd2c654a42563e56adbab (diff)
parent664c48e991a70d07646d54125e97f579f3a33be4 (diff)
downloadframeworks_base-cfa590392660fc4a50dc90c456d1fab69e6e0662.zip
frameworks_base-cfa590392660fc4a50dc90c456d1fab69e6e0662.tar.gz
frameworks_base-cfa590392660fc4a50dc90c456d1fab69e6e0662.tar.bz2
am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4' * commit '664c48e991a70d07646d54125e97f579f3a33be4': Remove dead code: NIOBuffer.
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r--core/jni/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index cb0bdd3..8310e56 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -96,7 +96,6 @@ LOCAL_SRC_FILES:= \
android/graphics/MaskFilter.cpp \
android/graphics/Matrix.cpp \
android/graphics/Movie.cpp \
- android/graphics/NIOBuffer.cpp \
android/graphics/NinePatch.cpp \
android/graphics/NinePatchImpl.cpp \
android/graphics/Paint.cpp \