diff options
| author | 2019-10-10 21:32:39 -0700 | |
|---|---|---|
| committer | 2019-10-10 21:32:39 -0700 | |
| commit | bf7239e2fb97f7ce4addd615a60bb66c4eaf48ab (patch) | |
| tree | e9b4925c032587b2fd2d74567670bb74259443e2 | |
| parent | ef85d3f75ca3a6bb10e3ab8ecb2e8caf6b833f98 (diff) | |
| parent | 0e6683ef7e7703cbc4879fdfac16093931a4000d (diff) | |
Merge "Update Ember's email"
am: 0e6683ef7e
Change-Id: Id3238ab619c35cea877ad50fba5a0e6729e10346
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | core/java/android/view/inspector/OWNERS | 4 |
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 |