am 22bede85: (-s ours) am 4266a10b: Merge "Remove a few ES2 tests from mustpass"...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:48 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:48 +0000 (10:45 +0000)
* commit '22bede8529e3535ad8ccc4065c3042d336dbde4a':


Trivial merge