Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9428c51 authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Adds OWNERS to com.androd.internal.util.Dump*" am: 0b6e3a95 am: 2727d1af

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

Change-Id: I9094e6421123193cc474520d43c00f299e64a3ac
parents 83dd0c4f 2727d1af
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -4,4 +4,8 @@ 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)