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

Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126'

* commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126':
  Fix proguard flag file dependency.
This commit is contained in:
Ying Wang 2010-09-30 11:28:06 -07:00 committed by Android Git Automerger
commit 4852f1a72e

View file

@ -17,6 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)