Merge "Update Ember's email" am: 0e6683ef7e

am: bf7239e2fb Change-Id: I394749d83ceac0e1373aa83f5f85ccf9cb29483b
2019-10-10 21:46:22 -07:00
parent d81e308a0d bf7239e2fb
commit 159091ed3f
2 changed files with 3 additions and 2 deletions
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1 @@
+Ember Rose <emberrose@google.com> <ashleyrose@google.com>
--- 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
+aurimas@google.com
+emberrose@google.com
				`@@ -0,0 +1 @@`
				`Ember Rose <emberrose@google.com> <ashleyrose@google.com>`