Merge "Use multiple patterns and/or emails in per-file syntax."
am: 4eb385c5da

Change-Id: I97be2944b07d0951cdfbd58a497f79f7f4dbc5a9