Commit f5e29e15 authored Apr 13, 2016 by Shinichiro Hamaji Committed by android-build-merger Apr 13, 2016

Merge "Merge "Let WAPPushManager depend on its proguard.flags" am: 4e2a67d0 am:...

Merge "Merge "Let WAPPushManager depend on its proguard.flags" am: 4e2a67d0 am: 15462bf9" into nyc-dev-plus-aosp
am: 1dd6bf7b

* commit '1dd6bf7b':
  Let WAPPushManager depend on its proguard.flags

Change-Id: I9d96cf7269c373f74c3988baf8796b461075259c

parents 515df8f1 1dd6bf7b

packages/WAPPushManager/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ LOCAL_PACKAGE_NAME := WAPPushManager
		LOCAL_JAVA_LIBRARIES += telephony-common
		LOCAL_STATIC_JAVA_LIBRARIES += android-common

		LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

		include $(BUILD_PACKAGE)