drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup OWNERS file merge conflicts.

Browse Source 
Change-Id: I8948b1361211825cc45f049f6484dc290620801b
This commit is contained in:
Xin Li 2022-04-01 21:00:58 +00:00
parent 0bb254bd3f
commit 4b9118275b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/util/OWNERS
View File

@ -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)