am ec3c15e5: am 04c4d34d: am 7311a344: Make it easier to enable obfuscation and optim...

author Ying Wang <wangying@google.com>

Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)
author Ying Wang <wangying@google.com>
Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history