am b95db75b: am b38a043e: Fix proguard flag file dependency.

Merge commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4'

* commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4':
  Fix proguard flag file dependency.
This commit is contained in:
Ying Wang 2010-09-30 11:28:00 -07:00 committed by Android Git Automerger
commit 1f28e33234

View File

@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_PACKAGE_NAME := Email LOCAL_PACKAGE_NAME := Email
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# The Emma tool analyzes code coverage when running unit tests on the # The Emma tool analyzes code coverage when running unit tests on the
# application. This configuration line selects which packages will be analyzed, # application. This configuration line selects which packages will be analyzed,