diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /core/java/android/appwidget/AppWidgetProvider.java | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'core/java/android/appwidget/AppWidgetProvider.java')
| -rwxr-xr-x | core/java/android/appwidget/AppWidgetProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/appwidget/AppWidgetProvider.java b/core/java/android/appwidget/AppWidgetProvider.java index 7871fb6..26712a1 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 |