diff options
| author | 2009-05-14 11:12:54 -0700 | |
|---|---|---|
| committer | 2009-05-14 11:12:54 -0700 | |
| commit | d47d81a4de581a85a55b8ed5f3a1f08cb573ccec (patch) | |
| tree | aff61142e67862b26996be1463c9eb99a666549f | |
| parent | 290bb011c5c1a9ba1f2116810b06cf52a9c36b3e (diff) | |
| parent | 60b88edea7132ddce90f2dced07c6706f1502270 (diff) | |
Merge change 1622 into donut
* changes:
Fix typos.
| -rwxr-xr-x | core/java/android/appwidget/AppWidgetProvider.java | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/appwidget/AppWidgetProvider.java b/core/java/android/appwidget/AppWidgetProvider.java index 7871fb6f65bf..26712a10f0ce 100755 --- a/core/java/android/appwidget/AppWidgetProvider.java +++ b/core/java/android/appwidget/AppWidgetProvider.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.os.Bundle; /** - * A conveience class to aid in implementing an AppWidget provider. + * A convenience class to aid in implementing an AppWidget provider. * Everything you can do with AppWidgetProvider, you can do with a regular {@link BroadcastReceiver}. * AppWidgetProvider merely parses the relevant fields out of the Intent that is received in * {@link #onReceive(Context,Intent) onReceive(Context,Intent)}, and calls hook methods diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 0b398bc3b965..fda584d99b8b 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -400,7 +400,7 @@ public final class Bitmap implements Parcelable { * @param y The y coordinate of the first pixel in source * @param width The number of pixels in each row * @param height The number of rows - * @param m Option matrix to be applied to the pixels + * @param m Optional matrix to be applied to the pixels * @param filter true if the source should be filtered. * Only applies if the matrix contains more than just * translation. |