summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmber Rose <emberrose@google.com>2019-10-03 17:19:20 -0400
committerEmber Rose <emberrose@google.com>2019-10-10 22:41:57 +0000
commit4e76b6acd6abcb91039393d1a01347fd10197b56 (patch)
treeff3f8344fd7fce9fd55adee956e1661c5303ad08
parent63df8520ff20bab04cfd330051150f14e8a99683 (diff)
Update Ember's email
Test: N/A Fix: 141939605 Change-Id: Icd9ae23a74175a98f8495f71c85b69891d387df0 Merged-In: Icd9ae23a74175a98f8495f71c85b69891d387df0
-rw-r--r--.mailmap1
-rw-r--r--core/java/android/view/inspector/OWNERS4
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..40c295ee59a5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Ember Rose <emberrose@google.com> <ashleyrose@google.com>
diff --git a/core/java/android/view/inspector/OWNERS b/core/java/android/view/inspector/OWNERS
index 0473f54e57ca..c2827cc31592 100644
--- a/core/java/android/view/inspector/OWNERS
+++ b/core/java/android/view/inspector/OWNERS
@@ -1,3 +1,3 @@
alanv@google.com
-ashleyrose@google.com
-aurimas@google.com \ No newline at end of file
+aurimas@google.com
+emberrose@google.com