DO NOT MERGE Refresh GLES 3.1 must-pass XML am: d8e85a9be9 -s ours am: ba3d0b4eb3...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:54:16 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:16 +0000 (19:54 +0000)
am: 41cd9b0153  -s ours

* commit '41cd9b015353247f3a6bf397716c81666fa676a4':


Trivial merge