diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index 294c4be33b819..110418a262cd5 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -113,6 +113,13 @@ use. Some of the changes include:</p>
     take advantage of the new templates with minimal adjustments in their code.
   </li>
 
+  <li>
+    <strong>Message style customization</strong>: You can customize more of the
+    user interface labels associated with your notifications using the
+    <code>MessageStyle</code> class. You can configure the message, conversation
+    title, and content view.
+  </li>
+
   <li>
     <strong>Bundled notifications</strong>: The system can group messages
     together, for example by message topic, and display the group. A user can
@@ -614,7 +621,7 @@ features such as face-tracking, eye-tracking, point scanning, and so on, to
 meet the needs of those users.</p>
 
 <p>For more information, see <code>android.accessibilityservice.GestureDescription</code>
-	in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.</p>
+  in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.</p>
 
 
 <h2 id="direct_boot">Direct boot</h2>
diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd
index 7ee09547d06fb..b8dfbaababcaf 100644
--- a/docs/html/preview/features/notification-updates.jd
+++ b/docs/html/preview/features/notification-updates.jd
@@ -16,6 +16,7 @@ trainingnavtop=true
   <li><a href="#direct">Direct Reply</a></li>
   <li><a href="#bundle">Bundled Notifications</a></li>
   <li><a href="#custom">Custom Views</a></li>
+  <li><a href="#style">Message Style</a></li>
 </ol>
 
 </div>
@@ -233,6 +234,12 @@ Builder.setGroup()} method to bundle similar notifications.</p>
   group.
 </p>
 
+<p class="note">
+  <strong>Note:</strong> If the same app sends four or more notifications
+  and does not specify a grouping, the
+  system automatically groups them together.
+</p>
+
 <p>To learn how to add notifications to a group, see
 <a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Add
 Each Notification to a Group</a>.</p>
@@ -348,7 +355,7 @@ the desired custom view style.</p>
 {@code DecoratedCustomViewStyle()} method.</p>
 
 <pre>
-Notification noti = new Notification.Builder()
+Notification notification = new Notification.Builder()
            .setSmallIcon(R.drawable.ic_stat_player)
            .setLargeIcon(albumArtBitmap))
            .setCustomContentView(contentView);
@@ -356,3 +363,27 @@ Notification noti = new Notification.Builder()
            .build();
 
 </pre>
+
+<h2 id="style">Message Style</h2>
+<p>
+  Android N introduces a new API for customizing the style of a notification.
+  Using the <code>MessageStyle</code> class, you can change several of the
+  labels displayed on the notification, including the conversation title,
+  additional messages, and the content view for the notification.
+</p>
+
+<p>
+  The following code snippet demonstrates how to customize a notification's
+  style using the <code>MessageStyle</code> class.
+</p>
+
+<pre>
+  Notification notification = new Notification.Builder()
+             .setStyle(new Notification.MessagingStyle("Me")
+             .setConversationTitle("Team lunch")
+             .addMessage("Hi", timestamp1, null) // Pass in null for user.
+             .addMessage("What's up?", timestamp2, "Coworker")
+             .addMessage("Not much", timestamp3, null)
+             .addMessage("How about lunch?", timestamp4, "Coworker")
+             .setAllow());
+</pre>
\ No newline at end of file