Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418312f4 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix... 

am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs

* commit '991ba3b7':
  fix typos bug: 11693951 bug: 12118617
parents 1732f263 991ba3b7

core/java/android/text/format/Time.java

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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>