tree 0eb2392aa17b56ddd4fbbc253a3ec7163be9264b
parent 320bb80651f27111c4540ebb7af9b559d568b93c
parent d1f7c70a2c8da8bb3285f052d02b4a9f9144d59c
author Chih-Hung Hsieh <chh@google.com> 1536098923 -0700
committer android-build-merger <android-build-merger@google.com> 1536098923 -0700

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

Change-Id: I19eb13d05145e6831a09ffc858786304235763ea