resolve merge conflicts of ba455914 to master
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)
commit07a7e24da3d3f04ea6df365a5cc1e5335f6a27a9
treed6da5d2a2716ddd7f97063153ba06a5b1c8f3c2d
parentcc65e0840744dc77a2c48432b771436b0cca04c7
parentba45591407d0207e8ba0634ea5636fd721ed781f
resolve merge conflicts of ba455914 to master

Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567
android/cts/master/gles31-master.txt