Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs

Browse Source 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
This commit is contained in:
Scott Main
2013-12-18 00:41:23 +00:00
committed by Android Git Automerger
parent 8c95a149b5 5dcb75e67b
commit efe1023328
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/format/Time.java
View File

@@ -512,7 +512,7 @@ public class Time {
* <pre> * <pre>
* Time time = new Time(); * Time time = new Time();
* time.set(4, 10, 2007); // set the date to Nov 4, 2007, 12am * 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 * time.monthDay += 1; // changes the date to Nov 5, 2007, 12am
* millis = time.toMillis(false); // millis is Nov 4, 2007, 11pm * millis = time.toMillis(false); // millis is Nov 4, 2007, 11pm
* millis = time.toMillis(true); // millis is Nov 5, 2007, 12am * millis = time.toMillis(true); // millis is Nov 5, 2007, 12am

2
docs/html/training/run-background-service/send-request.jd
View File

@@ -28,7 +28,7 @@ trainingnavtop=true
The previous lesson showed you how to create an {@link android.app.IntentService} class. This 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 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 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 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} in an {@link android.app.Activity} or {@link android.app.Fragment}
</p> </p>