Merge "Add a new imgdiag tool to diff boot.art/core.art against a process"

author Igor Murashkin <iam@google.com>

Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)
author Igor Murashkin <iam@google.com>
Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)
diff --cc Android.mk
Simple merge
diff --cc build/Android.common_build.mk
Simple merge
author	Igor Murashkin <iam@google.com>
	Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
build/Android.common_build.mk	patch \|	diff1 \|	diff2 \|	blob \| history