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

Commit 4c56bac2 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e90 

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

Change-Id: I9a93b5518d438d87b3f7da1871421f6cf3719590
parents 06dacb66 1ef34e90

cmds/idmap2/OWNERS

+2 −1
Original line number Diff line number Diff line 
set noparent

toddke@google.com

rtmitchell@google.com

patb@google.com
 
 No newline at end of file

core/java/android/app/RESOURCES_OWNERS

+1 −0
Original line number Diff line number Diff line 
rtmitchell@google.com

toddke@google.com

patb@google.com

core/java/android/os/incremental/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ alexbuy@google.com 
schfan@google.com

toddke@google.com

zyy@google.com

patb@google.com

core/java/com/android/server/OWNERS

+1 −1
Original line number Diff line number Diff line 
per-file SystemConfig.java = toddke@google.com
 
per-file SystemConfig.java = toddke@google.com,patb@google.com

core/proto/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ogunwale@google.com 
jjaggi@google.com

kwekua@google.com

roosa@google.com

per-file package_item_info.proto = toddke@google.com

per-file package_item_info.proto = toddke@google.com,patb@google.com

per-file usagestatsservice.proto, usagestatsservice_v2.proto = file:/core/java/android/app/usage/OWNERS

per-file apphibernationservice.proto = file:/core/java/android/apphibernation/OWNERS