diff options
| author | 2016-04-26 22:14:38 -0700 | |
|---|---|---|
| committer | 2016-04-26 22:14:38 -0700 | |
| commit | 8ce7d79c64f697df14238b70603ce49ddeb2e105 (patch) | |
| tree | cf19e46ba6a753735cb9ebf7c4e2969ead51cca6 | |
| parent | 6373dc7260bf2769783084d7d85b3438e8a893db (diff) | |
| parent | 70adfe39aee0f901824886cdb13a79022df4f6bb (diff) | |
resolve merge conflicts of 70adfe3 to nyc-dev
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
| -rw-r--r-- | core/java/android/app/Application.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 1174387d410f..53f3b845a088 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -33,7 +33,7 @@ import android.os.Bundle; * AndroidManifest.xml's <application> tag, which will cause that class * to be instantiated for you when the process for your application/package is * created. - * + * * <p class="note">There is normally no need to subclass Application. In * most situation, static singletons can provide the same functionality in a * more modular way. If your singleton needs a global context (for example @@ -84,7 +84,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { /** * Called when the application is starting, before any activity, service, * or receiver objects (excluding content providers) have been created. - * Implementations should be as quick as possible (for example using + * Implementations should be as quick as possible (for example using * lazy initialization of state) since the time spent in this function * directly impacts the performance of starting the first activity, * service, or receiver in a process. @@ -179,7 +179,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } // ------------------ Internal API ------------------ - + /** * @hide */ |