Merge "Manual merge of GLES2 test removals in M CTS" into nyc-dev
authorKalle Raita <kraita@google.com>
Fri, 26 Feb 2016 17:33:18 +0000 (17:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Feb 2016 17:33:18 +0000 (17:33 +0000)
commitfcef5d00d2bb813c357efe789da46b1789406b27
treeaf2647a6093ca180a721cae4350bce74305a4507
parent1545c387912df376ed495f4b3a7904ab250ce9ed
parent01b89644250a77aae7e4eefba419a9ef9fbfabfc
Merge "Manual merge of GLES2 test removals in M CTS" into nyc-dev
am: 01b8964425

* commit '01b89644250a77aae7e4eefba419a9ef9fbfabfc':
  Manual merge of GLES2 test removals in M CTS