diff options
| author | 2013-12-18 00:50:59 +0000 | |
|---|---|---|
| committer | 2013-12-18 00:50:59 +0000 | |
| commit | 991ba3b7f2d7164fab956b54c711d5ea523b2ba5 (patch) | |
| tree | a316295ad6089e800e33ec659a5f2ebf49120d35 | |
| parent | 84b8cbdafe1ed6b3d16291c6a0b7ec95ffcd076e (diff) | |
| parent | 74e9e698260c16c41dab38de302db6e3e807ddd5 (diff) | |
am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
fix typos bug: 11693951 bug: 12118617
| -rw-r--r-- | core/java/android/text/format/Time.java | 2 | ||||
| -rw-r--r-- | docs/html/training/run-background-service/send-request.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java index 5ef86b1a5456..f34e746adf6f 100644 --- a/core/java/android/text/format/Time.java +++ b/core/java/android/text/format/Time.java @@ -512,7 +512,7 @@ public class Time { * <pre> * Time time = new Time(); * time.set(4, 10, 2007); // set the date to Nov 4, 2007, 12am - * time.normalize(); // this sets isDst = 1 + * time.normalize(false); // this sets isDst = 1 * time.monthDay += 1; // changes the date to Nov 5, 2007, 12am * millis = time.toMillis(false); // millis is Nov 4, 2007, 11pm * millis = time.toMillis(true); // millis is Nov 5, 2007, 12am diff --git a/docs/html/training/run-background-service/send-request.jd b/docs/html/training/run-background-service/send-request.jd index 5b1114d47cf1..a9884c6c4f7c 100644 --- a/docs/html/training/run-background-service/send-request.jd +++ b/docs/html/training/run-background-service/send-request.jd @@ -28,7 +28,7 @@ trainingnavtop=true The previous lesson showed you how to create an {@link android.app.IntentService} class. This lesson shows you how to trigger the {@link android.app.IntentService} to run an operation by sending it an {@link android.content.Intent}. This {@link android.content.Intent} can - contain optionally contain data for the {@link android.app.IntentService} to process. You can + optionally contain data for the {@link android.app.IntentService} to process. You can send an {@link android.content.Intent} to an {@link android.app.IntentService} from any point in an {@link android.app.Activity} or {@link android.app.Fragment} </p> |