tree b262af058354d5b9965714df22ab333a9b272f04
parent 73690d387aa98a1ab0d5f476a1a21b545119fe3e
parent 0e5bd4e656555b0fd8153dee52ab48978e4a6489
author Chih-Hung Hsieh <chh@google.com> 1535360714 -0700
committer android-build-merger <android-build-merger@google.com> 1535360714 -0700

Merge "Use multiple patterns and/or emails in per-file syntax." am: faac4ad153
am: 0e5bd4e656

Change-Id: I7ee7f00051c39acd8f440925b28362b45ed52f79