commit bf0d8322ddba9f94d1e7018a32da593ef7a84a95
author chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Fri Jul 19 04:35:21 2019
committer Commit Bot <commit-bot@chromium.org> Fri Jul 19 04:35:21 2019
tree b74a758cc0faf33517704c604c93595ad1c5e7e4
parent 0b7b65f5a4cb0e024933ac4ae60afd7b310560c8

Roll src/third_party/catapult 42a883d13292..8508f3dc9250 (1 commits)

https://chromium.googlesource.com/catapult.git/+log/42a883d13292..8508f3dc9250


git log 42a883d13292..8508f3dc9250 --date=short --no-merges --format='%ad %ae %s'
2019-07-19 rmhasan@google.com [Typ] Augment test expectations format by adding a new descriptor called 'conflicts_allowed'


Created with:
  gclient setdep -r src/third_party/catapult@8508f3dc9250

The AutoRoll server is located here: https://autoroll.skia.org/r/catapult-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel

BUG=chromium:973936,chromium:976505
TBR=sadrul@google.com

Change-Id: Id41f039e0404806f60c6e194b8ef06bd1375bca5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709834
Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#678989}