am 22bede85: (-s ours) am 4266a10b: Merge "Remove a few ES2 tests from mustpass"...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:46:29 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:46:29 +0000 (19:46 +0000)
am: a1e0111bd5

* commit 'a1e0111bd591c2c8e142b703b3628183e689e255':


Trivial merge