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

* commit 'ca869ef3ea4710bfb8b232efcb219d985a8da696':


Trivial merge