Patch Set 7:

Please fix the merge conflict first.

This change depends on CB:40488 - for which you already voted +2 (thank you very much friend!). If CB:40488 gets merged, there wouldn't be any merge conflict with the master branch.

View Change

To view, visit change 40489. To unsubscribe, or for help writing mail filters, visit settings.