commit 922f8131ca0e431854eccf0e6963e58ff809dec0
author Chris Wren <cwren@android.com> Wed Jun 17 21:02:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 17 21:02:58 2015 +0000
tree 29bb39aa0157725694d8c034f8f62cdf727bc98a
parent e5b38436b9a9878a5b0329547f3fa05543c19c81
parent c4b7e3aa83895fe03f84a587831127418b0ac15f

Merge "Revert "remove setLatestEventInfo from prebuilts"" into mnc-dev

api/23.txt

diff --git a/api/23.txt b/api/23.txt
index a09311c..8bdda2c 100644
--- a/api/23.txt
+++ b/api/23.txt
@@ -4523,6 +4523,7 @@
     method public int describeContents();
     method public java.lang.String getGroup();
     method public java.lang.String getSortKey();
+    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
     field public static final java.lang.String CATEGORY_ALARM = "alarm";

system-api/23.txt

diff --git a/system-api/23.txt b/system-api/23.txt
index 0abe4c1..d0cf4b6 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -4613,6 +4613,7 @@
     method public int describeContents();
     method public java.lang.String getGroup();
     method public java.lang.String getSortKey();
+    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
     field public static final java.lang.String CATEGORY_ALARM = "alarm";