Merge "Clarified how to regenerate debug.keystore" into mnc-mr-docs am: 1452c87
am: 98a02c0

* commit '98a02c0b9a39bc1caba968520416e16e84f2b43b':
  Clarified how to regenerate debug.keystore

Change-Id: I6b61531f71b1b2ba4c8eef90f935e5d786e32b21
diff --git a/docs/html/tools/publishing/app-signing.jd b/docs/html/tools/publishing/app-signing.jd
index 4b74f5f..21067c6 100644
--- a/docs/html/tools/publishing/app-signing.jd
+++ b/docs/html/tools/publishing/app-signing.jd
@@ -299,13 +299,9 @@
 Settings\&lt;user&gt;\.android\</code> on Windows XP, and in
 <code>C:\Users\&lt;user&gt;\.android\</code> on Windows Vista and Windows 7.</p>
 
-<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>
-
-<p>Note that, if your development machine is using a non-Gregorian locale, the build tools may
-erroneously generate an already-expired debug certificate, so that you get an error when trying
-to compile your application. For workaround information, see the troubleshooting topic
-<a href="{@docRoot}resources/faq/troubleshooting.html#signingcalendar">I can't compile my app
-because the build tools generated an expired debug certificate</a>.</p>
+<p>The next time you build and run your app, the build tools will regenerate a
+  new keystore and debug key. Note that you must run your app, building alone
+  does not regenerate the keystore and debug key.</p>
 
 
 <h2 id="signing-manually">Signing Your App Manually</h2>