commit 960d919e814726f05ad1a9b82e6a9677f9977f15
author Ying Wang <wangying@google.com> Sat Feb 08 10:31:36 2014 -0800
committer Ying Wang <wangying@google.com> Sat Feb 08 10:31:46 2014 -0800
tree 6467a4fa91af2edee74930ba37ae77f94409ffdc
parent a6e8c6c1e0f659b3532bd86631104360b54016ea
parent 4df82b3e30794a3652a5dda773a74f486fec3325

resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 8863fe6..2419260 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -105,6 +105,7 @@
 LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization
 LOCAL_PROGUARD_FLAGS:=
 LOCAL_PROGUARD_FLAG_FILES:=
+LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=
 LOCAL_EMMA_COVERAGE_FILTER:=
 LOCAL_WARNINGS_ENABLE:=
 LOCAL_FULL_MANIFEST_FILE:=