summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmber Rose <emberr@google.com>2019-09-03 15:57:33 -0400
committerEmber Rose <emberr@google.com>2019-09-03 15:57:33 -0400
commit997dae601f42481fc49c54f14e4462bea7e34864 (patch)
treee1068b90d76eb5d045af3f02bd402aa6e142774a
parentb63ff32f531946a13d80f9340aaa8acf692cf145 (diff)
Update Ember's name and email
Test: N/A Bug: 140430299 Change-Id: Ibce843d4c206ccb7b2cb2bbc1d7d41c9b8fde3df
-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..b061ccf9e467
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Ember Rose <emberr@google.com> <ashleyrose@google.com>
diff --git a/core/java/android/view/inspector/OWNERS b/core/java/android/view/inspector/OWNERS
index 0473f54e57ca..4554fdc2bfa0 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
+emberr@google.com