tree 12e239b5ba84d6ce65988c25ab664520ea15d718
parent 2672f3f76ddb56477aed964fcf7df3bfbb57d679
parent b0ac53a53f19250e2f1d4215f6b860168fa3b6bc
author Nicholas Sauer <nicksauer@google.com> 1413480387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413480387 +0000

am b0ac53a5: Skip BrowserBenchTest#testOctane when any of following features are defined:

* commit 'b0ac53a53f19250e2f1d4215f6b860168fa3b6bc':
  Skip BrowserBenchTest#testOctane when any of following features are defined: