tree 3918338b8b5274004793fbfdbb534ce029e20678
parent 03559adae97fbdb1d9a9cfabd318f359c2d1342c
parent 9a4f3c85be59197a017684b9baa652d4c4d2977b
author Paul Duffin <paulduffin@google.com> 1618423523 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618423523 +0000

Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 am: 9a4f3c85be

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: I623ba2087ee0570855dda59c2c32220202129558