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

Commit c62adfc4 authored by Adam Langley's avatar Adam Langley Committed by Android Git Automerger
Browse files

Merge branch 'mnc-dev-plus-aosp' of...

Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp
parents 9d1ca4f7 0ae8fa75
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ public class AlarmManager {
        }

        /**
         * Returns an intent intent that can be used to show or edit details of the alarm clock in
         * Returns an intent that can be used to show or edit details of the alarm clock in
         * the application that scheduled it.
         *
         * <p class="note">Beware that any application can retrieve and send this intent,