Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e3d2382 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix some SDK build breakage. Not all."

parents df25b0ec f6d952bb

core/java/android/content/ClipData.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ import java.util.ArrayList; 
 * <p>For example, the implementation of {@link Item#coerceToText Item.coerceToText}

 * itself uses this to try to retrieve a URI clip as a stream of text:

 *

 * {@sample frameworks/base/core/java/android/content/ClippedData.java coerceToText}

 * {@sample frameworks/base/core/java/android/content/ClipData.java coerceToText}

 *

 * <a name="ImplementingCopy"></a>

 * <h3>Implementing Copy or Drag</h3>

core/java/android/content/ClipDescription.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.text.TextUtils; 
import java.util.ArrayList;



/**

 * Meta-data describing the contents of a {@link #ClipData}.  Provides enough

 * Meta-data describing the contents of a {@link ClipData}.  Provides enough

 * information to know if you can handle the ClipData, but not the data

 * itself.

 */