commit 7d849f8a2aeadb5b8a97b42fe5748dced3051126
author Ying Wang <wangying@google.com> Thu Sep 30 09:32:14 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 30 09:32:14 2010 -0700
tree b68e5497972404db5d4b11389a0e8c39df8f4173
parent 4d158dc2779ffff8c92a41f32e6885bd0f155fc3
parent 2d6a0c68c29c94b492a93d06d072568d767c1e72

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

Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp

* commit '2d6a0c68c29c94b492a93d06d072568d767c1e72':
  Fix proguard flag file dependency.

java/Android.mk

diff --git a/java/Android.mk b/java/Android.mk
index e966fc7..03d48aa 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -17,6 +17,6 @@
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)