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

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

am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e': Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
171633db · Wink Saville · Android Git Automerger · c1c1e417 · e4334439 · 171633db
Commit 171633db authored Aug 08, 2013 by Wink Saville Committed by Android Git Automerger Aug 08, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Android.mk Android.mk +2 -2

No files found.
--- a/Android.mk
+++ b/Android.mk
@@ -365,8 +365,8 @@ LOCAL_SRC_FILES := \
        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