diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-01-05 14:04:06 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2011-01-05 14:04:06 -0800 |
| commit | 70588bf864f961974c93aace7586d3e2773a54a8 (patch) | |
| tree | 96f20ead5d33bef526758486ffb3e5cbd08c8049 /core/java/android/app | |
| parent | e0f9552cc13b51bf82bc0002f294f197dceb0386 (diff) | |
| parent | 3a2c6bf0fcae9421cccf113ff972df7aaeb6d3e9 (diff) | |
| download | frameworks_base-70588bf864f961974c93aace7586d3e2773a54a8.zip frameworks_base-70588bf864f961974c93aace7586d3e2773a54a8.tar.gz frameworks_base-70588bf864f961974c93aace7586d3e2773a54a8.tar.bz2 | |
resolved conflicts for merge of 3a2c6bf0 to master
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/AlertDialog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index d9cafb6..9850a12 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -479,7 +479,7 @@ public class AlertDialog extends Dialog implements DialogInterface { } /** - * Sets whether the dialog is cancelable or not default is true. + * Sets whether the dialog is cancelable or not. Default is true. * * @return This Builder object to allow for chaining of calls to set methods */ |