summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2020-09-25 17:14:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-25 17:14:22 +0000
commit704eaaeea911991e0356a9c43de0590bb2117528 (patch)
treef1831bdc5778948e433a8ab3763061b70f2bc22d
parentbb4a70c6275c27d51fff2fa53cbd876484659706 (diff)
parentbf81503306761ff4764e1152489ee7802f6d5a64 (diff)
Merge "Add roosa to ONWERS" am: ee1693c4f8 am: cb4ed8dcc4 am: 0857ac2716 am: bf81503306
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438333 Change-Id: If9df4c8545011511aa400270dbfb9d8b10720a7b
-rw-r--r--core/proto/OWNERS1
-rw-r--r--services/core/java/com/android/server/inputmethod/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/proto/OWNERS b/core/proto/OWNERS
index 4892faaceafe..11f6a912faf7 100644
--- a/core/proto/OWNERS
+++ b/core/proto/OWNERS
@@ -14,6 +14,7 @@ per-file settings_enums.proto=tmfang@google.com
# Frameworks
ogunwale@google.com
jjaggi@google.com
+roosa@google.com
per-file usagestatsservice.proto, usagestatsservice_v2.proto = mwachens@google.com
# Launcher
diff --git a/services/core/java/com/android/server/inputmethod/OWNERS b/services/core/java/com/android/server/inputmethod/OWNERS
index 25ef9facb216..c09ade9e075f 100644
--- a/services/core/java/com/android/server/inputmethod/OWNERS
+++ b/services/core/java/com/android/server/inputmethod/OWNERS
@@ -4,3 +4,4 @@ ogunwale@google.com
yukawa@google.com
tarandeep@google.com
lumark@google.com
+roosa@google.com