tree 8c029853a28935d0fb0ae38201b33d3b47532024
parent 1c89413b585a6565d0e84303afc236cbb20d6936
parent 4eb385c5da1689b63f3fc9bf6bbf44865e9ffcb2
author Chih-Hung Hsieh <chh@google.com> 1536098356 -0700
committer android-build-merger <android-build-merger@google.com> 1536098356 -0700

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

Change-Id: I97be2944b07d0951cdfbd58a497f79f7f4dbc5a9