Merge "Update Ember's email"

am: 0e6683ef7e Change-Id: Id3238ab619c35cea877ad50fba5a0e6729e10346
2019-10-10 21:32:39 -07:00
parent ef85d3f75c 0e6683ef7e
commit bf7239e2fb
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>`