summaryrefslogtreecommitdiffstats
path: root/core/java/android/appwidget
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-01-08 12:52:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-08 12:52:38 -0800
commit8a05d13ef656b0147d85e1826b70a55f6b32e1e3 (patch)
treecdb0b15c9a6a2ddc63b71d9c6eda4826de44b6de /core/java/android/appwidget
parent3ccb33d5e08a0f444d16be894827dcbdfd0db42f (diff)
parent5b56d43237d959403bb8a32de25376deee2dab22 (diff)
downloadframeworks_base-8a05d13ef656b0147d85e1826b70a55f6b32e1e3.zip
frameworks_base-8a05d13ef656b0147d85e1826b70a55f6b32e1e3.tar.gz
frameworks_base-8a05d13ef656b0147d85e1826b70a55f6b32e1e3.tar.bz2
am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
* commit '5b56d43237d959403bb8a32de25376deee2dab22': docs: resolve bugs from external tracker
Diffstat (limited to 'core/java/android/appwidget')
-rw-r--r--core/java/android/appwidget/AppWidgetManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 9c19766..6b1c3e2 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -239,7 +239,7 @@ public class AppWidgetManager {
public static final String EXTRA_CUSTOM_SORT = "customSort";
/**
- * A sentiel value that the AppWidget manager will never return as a appWidgetId.
+ * A sentinel value that the AppWidget manager will never return as a appWidgetId.
*/
public static final int INVALID_APPWIDGET_ID = 0;