diff options
| author | 2019-09-04 17:16:29 +0000 | |
|---|---|---|
| committer | 2019-09-04 17:16:29 +0000 | |
| commit | d5c504d58781b6dd8649bf5a95aa5ae60c0e10ae (patch) | |
| tree | 07f2bb55091fdaa743f26a5f10378b45e54fe699 | |
| parent | 6b6c292e0a8cb4cbdad0a3da3ab27ddf95d54fbe (diff) | |
| parent | 997dae601f42481fc49c54f14e4462bea7e34864 (diff) | |
Merge "Update Ember's name and email"
| -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..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 |