summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-10-11 18:01:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-10-11 18:01:29 +0000
commitf1dd657edf87946d98f7f9f95f464e4082306163 (patch)
tree7e08cec8f3c512f72e87da3191fd28443fe92967
parent93af341d5e7f1377b9ebac1bf9bb224013444c4b (diff)
parent68a365fe55f9b663d085d75e4ab0e5837cdaa077 (diff)
Merge "Canonicalize notification channel sounds for backup am: 2d7a4a3f67 am: 4229c3fcbd"
-rw-r--r--core/java/android/app/NotificationChannel.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java
index 47063f0842e8..c06ad3f32cf4 100644
--- a/core/java/android/app/NotificationChannel.java
+++ b/core/java/android/app/NotificationChannel.java
@@ -32,6 +32,8 @@ import android.util.proto.ProtoOutputStream;
import com.android.internal.util.Preconditions;
+import com.android.internal.util.Preconditions;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParser;