commit 3230ef9c0661f6ee65370ca0f11dafb723d97bf5
author Dan Egnor <egnor@google.com> Sat Nov 14 16:32:39 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Nov 14 16:32:39 2009 -0800
tree bf5164f606efdf91a2e6fc4f45ced2951152f4fa
parent 17831dd428419686ec0e6da9b25fd593bdee7ac0
parent 30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea

am 30dc8d1e: Merge change I61343808 into eclair-mr2

Merge commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea' into eclair-mr2-plus-aosp

* commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea':
  Remove external/protobuf from the build, now that it's

Android.mk

diff --git a/Android.mk b/Android.mk
index a46e4f7..5bc3f4f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -523,7 +523,6 @@
 ext_dirs := \
 	../../external/apache-http/src \
 	../../external/gdata/src \
-	../../external/protobuf/src \
 	../../external/tagsoup/src
 
 ext_src_files := $(call all-java-files-under,$(ext_dirs))