| commit | eda5a4f25162f828e4afae7a88d9ea997b4f0134 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 22 13:26:27 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 22 13:26:27 2024 +0000 |
| tree | 838f3ad5b9bd770c8b7111e22eed0c03f820e441 | |
| parent | 11244bbb7c3e5b724ceeaaa8ba409b621388d5db [diff] | |
| parent | 75270a050ecc6413997c2db00cfeb93351595a51 [diff] |
Merge "Add tweek@ to android.security OWNERS" into main am: 448a9ffa3c am: 75270a050e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3217575 Change-Id: I5af6b9589357615ade8d08d7c8b989e36b4f9841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/security/OWNERS b/core/java/android/security/OWNERS index 8bd6c85..c38ee08 100644 --- a/core/java/android/security/OWNERS +++ b/core/java/android/security/OWNERS
@@ -3,6 +3,7 @@ brambonne@google.com eranm@google.com jeffv@google.com +tweek@google.com per-file *NetworkSecurityPolicy.java = file:net/OWNERS per-file Confirmation*.java = file:/keystore/OWNERS