am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation...

author Ying Wang <wangying@google.com>

Fri, 23 Aug 2013 19:19:48 +0000 (12:19 -0700)

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

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