Merge "Fix makefile include for support-v4" into oc-dev

am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3

diff --git a/Android.mk b/Android.mk
index 47e9c86..d539141 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser