Merge "Sort more instances of wildcard and find"

author Dan Willemsen <dwillemsen@google.com>

Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)

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

Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)
author Dan Willemsen <dwillemsen@google.com>
Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/droiddoc.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/droiddoc.mk	patch \|	diff1 \|	diff2 \|	blob \| history