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

Commit eaf46d2a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up keystore owners" into main am: 6faa3711 am: 2a2ea588 

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



Change-Id: I3d67ebe574efc524df65065b3280bb41ba5718a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f96d78f4 2a2ea588

keystore/java/android/security/OWNERS

+1 −1
Original line number Diff line number Diff line 
per-file *.java,*.aidl = eranm@google.com,pgrafov@google.com,rubinxu@google.com

per-file *.java,*.aidl = drysdale@google.com,jbires@google.com,pgrafov@google.com,rubinxu@google.com

per-file KeyStoreManager.java = mpgroover@google.com

keystore/tests/OWNERS

+4 −1
Original line number Diff line number Diff line 
# Android HW Trust team

drysdale@google.com

jbires@google.com



# Android Enterprise security team

eranm@google.com

pgrafov@google.com

rubinxu@google.com