Skip to content
Snippets Groups Projects
Commit 4852f1a7 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread 

Merge commit '7d849f8a'

* commit '7d849f8a':
  Fix proguard flag file dependency.
parents d2a74e9f 7d849f8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
java/Android.mk
+ 1
− 1
View file @ 4852f1a7
...@@ -17,6 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common ...@@ -17,6 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment