summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-07Merge "Migrate Test Targets to New Android Ownership Model" into main am: ↵HEADmastermainTreehugger Robot
031838f00f Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2946429 Change-Id: I8103218cb171b3595a3a5997c1be1c6c8c859a4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07Merge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ia0416bb7dba5466b96ed38898c607f117997d118
2023-12-12Merge "Fix the issue of being unable to jump to app notification settings" ↵Treehugger Robot
into main am: a1ffa91bec am: 7b16dd10f8 am: a3869deb33 Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2869936 Change-Id: I17443bb8efd8e4e2d8e93a023961ab12240f1a24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Fix the issue of being unable to jump to app notification settings" ↵Treehugger Robot
into main am: a1ffa91bec am: 7b16dd10f8 Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2869936 Change-Id: I026adb61c337e5de548fe18f65ce5a60b048d440 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Fix the issue of being unable to jump to app notification settings" ↵Treehugger Robot
into main am: a1ffa91bec Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2869936 Change-Id: I6295458693639ffdfb00b3399f5478273fb527f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Fix the issue of being unable to jump to app notification settings" ↵Treehugger Robot
into main
2023-12-12Fix the issue of being unable to jump to app notification settingsShen Lin
The extra key of `packageName` needs to be update Bug: 315868361 Test: manually by using cuttlefish Change-Id: Ia3cf6dc227fdc02327280e57a67576ba1aae67bd
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: b2a4aaca00 -s ↵Xin Li
ours am: b125fe335d -s ours am: 796e7bc598 -s ours am: 982a763bde -s ours am: a790dc602c -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I6541e55b5d8d4cfcdf99fce42ed244024e617b66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 7ed739b69f -s ours am: 2d3ff30bff ↵Xin Li
-s ours am: dc847123b5 -s ours am: ae7b618c44 -s ours am: 935c2c6d5b -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: If790af3f08e76bb8b902b2cfc454d83041c280e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: b2a4aaca00 -s ↵Xin Li
ours am: b125fe335d -s ours am: 796e7bc598 -s ours am: 982a763bde -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I53b446a7e4e23c81f7656a65a8a1ff8eee9bd2c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7ed739b69f -s ours am: 2d3ff30bff ↵Xin Li
-s ours am: dc847123b5 -s ours am: ae7b618c44 -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: Ie78c76bd48e11decb1abed02fe80127bb3f34e71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: b2a4aaca00 -s ↵Xin Li
ours am: b125fe335d -s ours am: 796e7bc598 -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I031ae46f2079708dedb9aa97f0ce9d7e452864e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7ed739b69f -s ours am: 2d3ff30bff ↵Xin Li
-s ours am: dc847123b5 -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: Ic6308798a4cab354b79f900343490d2eead976e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: b2a4aaca00 -s ↵Xin Li
ours am: b125fe335d -s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I5055cc852957f8e34afd349372418a88a274d25e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7ed739b69f -s ours am: 2d3ff30bff ↵Xin Li
-s ours am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: If0d272cdf2f5afd909a899609ee9cf9c4b59a50c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: b2a4aaca00 -s oursXin Li
am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I4468ed41afdae3ef477d8d2470f44f7d9fd71265 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7ed739b69f -s oursXin Li
am skip reason: Merged-In I71990254cb26da08b7039749f58b82755c441fc2 with SHA-1 b2dafd9152 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2776744 Change-Id: I969e692f6c4f532ef916e1e3bfd3761d0fec0e9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I71990254cb26da08b7039749f58b82755c441fc2 Change-Id: Idcd7cfa1b655130d6e72eb9dd61ad1cd5a07520f
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 26f4136733 -s ours ↵Xin Li
am: b1b160af14 -s ours am: e5e9868aad -s ours am: f0b20054a9 -s ours am skip reason: Merged-In If8e78d1437c516cdb46a3ae170caee1cedc618d9 with SHA-1 d2759329f0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/24182835 Change-Id: I542fa4b40c0f599bba4cf4d0fadded55c8e75218 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 26f4136733 -s ours ↵Xin Li
am: b1b160af14 -s ours am: e5e9868aad -s ours am skip reason: Merged-In If8e78d1437c516cdb46a3ae170caee1cedc618d9 with SHA-1 d2759329f0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/24182835 Change-Id: Ia61f2b7a3dceffbe6b51fb5f891d9f877236b19f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 26f4136733 -s ours ↵Xin Li
am: b1b160af14 -s ours am skip reason: Merged-In If8e78d1437c516cdb46a3ae170caee1cedc618d9 with SHA-1 d2759329f0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/24182835 Change-Id: I8e2d7f56bb45f4bf10bac2642d48cf2c2e8143ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 26f4136733 -s oursXin Li
am skip reason: Merged-In If8e78d1437c516cdb46a3ae170caee1cedc618d9 with SHA-1 d2759329f0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/24182835 Change-Id: Iab1ec523eda56f41347f78babe13c21951be1474 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: If8e78d1437c516cdb46a3ae170caee1cedc618d9 Change-Id: I3552c1d78154a15b82b14ed291610821ae8b8d31
2023-04-24Cleaner build fix. am: b2dafd9152 am: d2759329f0 am: 7b2c52e68fAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: I16e12efd883585fd4fbb20ff84619d98161c47e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152 am: 4dbcc2f2c1 am: d825450f34Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: I0808bea75d6bc179a6022229cba2dfc18d9a1164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152 am: d2759329f0Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: I0512920ae43559acfe1e5c1003663cf935dfef3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152 am: 4dbcc2f2c1Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: Ibc1940c53feb7e27d448170274dfafb823b82f80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152 am: 4d7b743a91Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: I2cde41e284634c55d9e3a2bc16607e3216baf2f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: I1ed964b3963de776c0c94b9954ab6f8a6cd21d1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: Ie16e1ca3504da2fb9a62dcc2726c21990811422c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Cleaner build fix. am: b2dafd9152Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22787851 Change-Id: If8e78d1437c516cdb46a3ae170caee1cedc618d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Cleaner build fix.android14-devAlex Buynytskyy
Bug: 275409981 Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=bluejay TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=out/dist continuous_instrumentation_tests continuous_native_tests platform_tests device-tests test_mapping Change-Id: I71990254cb26da08b7039749f58b82755c441fc2
2023-04-21Build fix. am: cd2f35f20f am: 99aa3f02e3Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22779832 Change-Id: I5f44eebf7401e084296be17d670e81ea8b3b35f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Build fix. am: cd2f35f20f am: 1650a9b3e9Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22779832 Change-Id: Ief869651d7086ee199e60fc5b963768883a2f485 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Build fix. am: cd2f35f20fAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22779832 Change-Id: I97f56b8b4d03049f984f6510a6e9fce975fab88f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Build fix. am: cd2f35f20fAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/22779832 Change-Id: I6b2b6f3b21494e6db323d735a5e887a4878ae042 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Build fix.Alex Buynytskyy
packages/apps/DeskClock/src/com/android/deskclock/Utils.kt:319:26: error: type mismatch: inferred type is AlarmManager.AlarmClockInfo? but AlarmManager.AlarmClockInfo was expected am.setAlarmClock(info, op) ^ packages/apps/DeskClock/src/com/android/deskclock/Utils.kt:319:32: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected am.setAlarmClock(info, op) ^ packages/apps/DeskClock/src/com/android/deskclock/data/TimerModel.kt:812:84: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected am.setExactAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP, triggerTime, pi) ^ packages/apps/DeskClock/src/com/android/deskclock/data/TimerModel.kt:814:67: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected am.setExact(ELAPSED_REALTIME_WAKEUP, triggerTime, pi) https://android-build.googleplex.com/builds/pending/P54969978/aosp_bramble_hwasan-userdebug/latest/view/logs/build_error.log Bug: 275409981 Test: local finalization topic + m Change-Id: I9da10deeef7752617638747f95a8b7aeb4be8b01
2022-10-18[automerger skipped] Fix for: error: 'when' expression must be exhaustive, ↵Ryan O'Leary
add necessary 'null' branch or 'else' branch instead am: 7c3d4069aa -s ours am: 5ba07cec08 -s ours am skip reason: Merged-In Icfbeaf6d380efcc17cc02bc8299c9ba64c202d2e with SHA-1 2d796a4ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/20142217 Change-Id: I00e6c6b0bf56334fe129f7ddf73bf5809f0c91bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17[automerger skipped] Fix for: error: 'when' expression must be exhaustive, ↵android-u-beta-1-gplRyan O'Leary
add necessary 'null' branch or 'else' branch instead am: 7c3d4069aa -s ours am skip reason: Merged-In Icfbeaf6d380efcc17cc02bc8299c9ba64c202d2e with SHA-1 2d796a4ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/20142217 Change-Id: I71e76fcb5a2eabc88cd038f777cf3e2e6219d59d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Fix for: error: 'when' expression must be exhaustive, add necessary 'null' ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseRyan O'Leary
branch or 'else' branch instead AOSP DeskClock contains multiple warnings that become errors when updating to Kotlin 1.7. One such error is that 'when' expressions must be exhaustive (even if all cases are functionally covered). A simple fix for this is to simply add an empty null branch (i.e. null -> { }) at the end of the when statement. Bug: 237017037 Test: Ran `adb shell am instrument -w com.android.deskclock.tests` with output: Time: 54.056 OK (68 tests) Change-Id: Icfbeaf6d380efcc17cc02bc8299c9ba64c202d2e (cherry picked from commit 2d796a4ee72adf6d2016f7650c50b8eb6ec0c8e7) Merged-In: Icfbeaf6d380efcc17cc02bc8299c9ba64c202d2e
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: f6fb82fde9 ↵Xin Li
-s ours am: 01855db9df -s ours am: 4d328ce766 -s ours am: f3551203bb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: I32ef16867c9342b370055a6d0fb72aa6eab6cd9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6643ed0ca2 -s ours ↵Xin Li
am: 8812b6f75e -s ours am: b390a8adc8 -s ours am: 466aa5e35c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: Icbd49da4710122e49933115a451688391807f895 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: f6fb82fde9 ↵main-16k-with-phonesXin Li
-s ours am: 01855db9df -s ours am: 4d328ce766 -s ours am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: Ieaf9ce2136bf183a493a7f1b7f2dac43c8924caf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6643ed0ca2 -s ours ↵Xin Li
am: 8812b6f75e -s ours am: b390a8adc8 -s ours am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: I9165c5fefd45e6a8053f63fcb66188a2f1a6ace3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: f6fb82fde9 ↵Xin Li
-s ours am: 01855db9df -s ours am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: I60a96da7c573b725ab8752caf59c24e79b3ea299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6643ed0ca2 -s ours ↵Xin Li
am: 8812b6f75e -s ours am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: I3ae06c8df0913168bcedbaf0d8d09f05a3c0c41c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: f6fb82fde9 ↵Xin Li
-s ours am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: I7230479d4fadd4960ac4bd7b6f0d16bddd51116d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6643ed0ca2 -s oursXin Li
am skip reason: Merged-In I976533b061ab22650a037ff960eaef2891b612cf with SHA-1 7ab78adfa6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2184502 Change-Id: Ie7792704debaa31d9266b6737500c6984ae32e4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 23:33:22 +0000