Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053

author Colin Cross <ccross@android.com>

Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
author Colin Cross <ccross@android.com>
Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/main.mk
Simple merge
author	Colin Cross <ccross@android.com>
	Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history