commit 48ee66d295979372ed0234cefda42385daae8312
author Wink Saville <wink@google.com> Thu Aug 08 23:21:35 2013
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 08 23:21:35 2013
tree 85bd4e479b70d7afffbbcf48645b44f6160d127c
parent a38aedb3fff651a4e1921162d88df3e1c75726b3
parent ece98e5f6728a937c8d32d342f3b1b037a611f3e

am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
  Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.

Android.mk

diff --git a/Android.mk b/Android.mk
index 259dabe..56419db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -365,8 +365,8 @@
         src/google/protobuf/unittest_import_nano.proto \
         src/google/protobuf/unittest_simple_nano.proto \
         src/google/protobuf/unittest_stringutf8_nano.proto \
-        src/google/protobuf/unittest_recursive_nano.proto \
-        src/google/protobuf/unittest_enum_multiplejava_nano.proto
+        src/google/protobuf/unittest_recursive_nano.proto
+
 
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src