From ab8ea9ff01cf728f2fdb43506d64e6d0dde65d71 Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Fri, 6 Oct 2017 19:02:28 -0700
Subject: [PATCH] docs: Tiny usage fix ("e-mail" -> "email")

I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.

Test: make ds-docs
Bug: 67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
---
 core/java/android/app/Activity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e14b7382e8279..26f5ba130b7b6 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -542,9 +542,9 @@ import java.util.List;
  * <ul>
  *     <li> <p>When creating a new document, the backing database entry or file for
  *             it is created immediately.  For example, if the user chooses to write
- *             a new e-mail, a new entry for that e-mail is created as soon as they
+ *             a new email, a new entry for that email is created as soon as they
  *             start entering data, so that if they go to any other activity after
- *             that point this e-mail will now appear in the list of drafts.</p>
+ *             that point this email will now appear in the list of drafts.</p>
  *     <li> <p>When an activity's <code>onPause()</code> method is called, it should
  *             commit to the backing content provider or file any changes the user
  *             has made.  This ensures that those changes will be seen by any other