Merge "Add progress indicator to Android.mk includes"

author Dan Willemsen <dwillemsen@google.com>

Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)

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

Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)
author Dan Willemsen <dwillemsen@google.com>
Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/main.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history