From 4b9118275ba2d97d51c338e7a39d1f30a6678559 Mon Sep 17 00:00:00 2001 From: Xin Li Date: Fri, 1 Apr 2022 21:00:58 +0000 Subject: [PATCH] Fixup OWNERS file merge conflicts. Change-Id: I8948b1361211825cc45f049f6484dc290620801b --- core/java/com/android/internal/util/OWNERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/java/com/android/internal/util/OWNERS b/core/java/com/android/internal/util/OWNERS index ecc57776a498..354dd9a41586 100644 --- a/core/java/com/android/internal/util/OWNERS +++ b/core/java/com/android/internal/util/OWNERS @@ -4,8 +4,4 @@ per-file *Notification* = file:/services/core/java/com/android/server/notificati per-file *ContrastColor* = file:/services/core/java/com/android/server/notification/OWNERS per-file Protocol* = etancohen@google.com, lorenzo@google.com per-file State* = jchalard@google.com, lorenzo@google.com, satk@google.com -<<<<<<< TARGET BRANCH (83dd0c Merge "(ImsService API changes for Better IMS Threading) Ims) -per-file DataClass* = eugenesusla@google.com -======= per-file *Dump* = file:/core/java/com/android/internal/util/dump/OWNERS ->>>>>>> SOURCE BRANCH (2727d1 Merge "Adds OWNERS to com.androd.internal.util.Dump*" am: 0b)