Merge \\\"Add tests for varying linking by location\\\" into nyc-dev am: 74079c6d92...

author Pyry Haulos <phaulos@google.com>

Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)

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

Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)
author Pyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)
diff --cc android/cts/master/com.drawelements.deqp.vk.xml
Simple merge
diff --cc android/cts/master/vk-master.txt
Simple merge
author	Pyry Haulos <phaulos@google.com>
	Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 13 Jun 2016 23:54:50 +0000 (23:54 +0000)
		1	2
android/cts/master/com.drawelements.deqp.vk.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history