Merge "Remove junit classes from legacy-android-test" am: 4418418adb am: d724c112f3

author Paul Duffin <paulduffin@google.com>

Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)

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

Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)
author Paul Duffin <paulduffin@google.com>
Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)
diff --cc test-base/Android.bp
Simple merge
diff --cc test-runner/Android.bp
Simple merge
author	Paul Duffin <paulduffin@google.com>
	Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)
		1	2
test-base/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
test-runner/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history