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


Trivial merge