am 9c836723: am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into...

author Dimitry Ivanov <dimitry@google.com>

Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)

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

Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)
author Dimitry Ivanov <dimitry@google.com>
Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/package_internal.mk
Simple merge
author	Dimitry Ivanov <dimitry@google.com>
	Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history