commit b9b12aa6a9f92690b8e5f956c20ac77e796ca529
author Adam Cohen <adamcohen@google.com> Tue Sep 30 23:08:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 30 23:08:03 2014 +0000
tree 7c7104b11f98786abafc1bb0808183709602f59a
parent 76f6e26e85dd6fcddc2fc72e873f6f9851492c43
parent adf571c7725f0281a3e37a4b6254818da956ca53

am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit 'adf571c7725f0281a3e37a4b6254818da956ca53':
  Don't let old Launcher activity interfere with new one

src/com/android/launcher3/config/ProviderConfig.java

diff --git a/src/com/android/launcher3/config/ProviderConfig.java b/src/com/android/launcher3/config/ProviderConfig.java
index db25076..e8930d0 100644
--- a/src/com/android/launcher3/config/ProviderConfig.java
+++ b/src/com/android/launcher3/config/ProviderConfig.java
@@ -18,5 +18,5 @@
 
 public class ProviderConfig {
 
-    public static final String AUTHORITY = "com.android.launcher3.settings";
+    public static final String AUTHORITY = "com.android.launcher3.settings".intern();
 }