Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into...

author Prerepa Viswanadham <dham@google.com>

Wed, 25 Mar 2015 20:03:11 +0000 (20:03 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 25 Mar 2015 20:03:12 +0000 (20:03 +0000)
author Prerepa Viswanadham <dham@google.com>
Wed, 25 Mar 2015 20:03:11 +0000 (20:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 Mar 2015 20:03:12 +0000 (20:03 +0000)
diff --cc android/cts/com.drawelements.deqp.gles31.xml
Simple merge
diff --cc android/cts/es31-lmp-mr1.txt
Simple merge
diff --cc android/cts/es31-lmp.txt
Simple merge
author	Prerepa Viswanadham <dham@google.com>
	Wed, 25 Mar 2015 20:03:11 +0000 (20:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 Mar 2015 20:03:12 +0000 (20:03 +0000)
		1	2
android/cts/com.drawelements.deqp.gles31.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/es31-lmp-mr1.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/es31-lmp.txt	patch \|	diff1 \|	diff2 \|	blob \| history