diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-09-18 14:12:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 14:12:58 -0700 |
| commit | 6d0db04bed79f371b537feae3efa9b5e6fe8876c (patch) | |
| tree | 6e61c8368a02a4bd78bf77361cf37807b3dd7367 /core | |
| parent | 107218d741811e93350577aac3e38b8528ef45e3 (diff) | |
| parent | 7b3990ec81fc218f655d44624758e15ce378968e (diff) | |
| download | frameworks_base-6d0db04bed79f371b537feae3efa9b5e6fe8876c.zip frameworks_base-6d0db04bed79f371b537feae3efa9b5e6fe8876c.tar.gz frameworks_base-6d0db04bed79f371b537feae3efa9b5e6fe8876c.tar.bz2 | |
am 7b3990ec: Merge "Update the print dialog." into klp-dev
* commit '7b3990ec81fc218f655d44624758e15ce378968e':
Update the print dialog.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/print/PrintAttributes.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index efe6b15..e61fe89 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -391,7 +391,7 @@ public final class PrintAttributes implements Parcelable { public static final MediaSize NA_LEDGER = new MediaSize("NA_LEDGER", "android", R.string.mediaSize_na_ledger, 17000, 11000); /** North America Tabloid media size: 11" x 17" (279mm × 432mm) */ - public static final MediaSize NA_TBLOID = + public static final MediaSize NA_TABLOID = new MediaSize("NA_TABLOID", "android", R.string.mediaSize_na_tabloid, 11000, 17000); /** North America Index Card 3x5 media size: 3" x 5" (76mm x 127mm) */ |