DO NOT MERGE Refresh GLES 3.1 must-pass XML am: d8e85a9be9 -s ours am: ba3d0b4eb3...
authorKalle Raita <kraita@google.com>
Mon, 14 Dec 2015 21:42:05 +0000 (13:42 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Dec 2015 21:42:05 +0000 (13:42 -0800)
am: 51238b6c80  -s ours

* commit '51238b6c8098470805a655d29aa32b6df43c16a2':
  DO NOT MERGE Refresh GLES 3.1 must-pass XML


Trivial merge