summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10447354 from ce04ba0d44375dd82b3bdccbb5290693eeefcb9e to ↵aml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010android14-mainline-wifi-releaseAndroid Build Coastguard Worker
mainline-wifi-release Change-Id: I57d9a6cd749057fe326ccbdf4f9dad67870824bb
2023-04-21Build fix. am: 3e92647982Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/22780457 Change-Id: I246cd07e03417fc580e9c726e94424373bca5255 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Build fix.android14-devAlex Buynytskyy
packages/apps/Calendar/src/com/android/calendar/AllInOneActivity.kt:72:1: error: class 'AllInOneActivity' is not abstract and does not implement abstract member public abstract fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences!, key: String?): Unit defined in android.content.SharedPreferences.OnSharedPreferenceChangeListener class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListener, ^ packages/apps/Calendar/src/com/android/calendar/AllInOneActivity.kt:686:5: error: 'onSharedPreferenceChanged' overrides nothing override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String) { ^ packages/apps/Calendar/src/com/android/calendar/GeneralPreferences.kt:49:1: error: class 'GeneralPreferences' is not abstract and does not implement abstract member public abstract fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences!, key: String?): Unit defined in android.content.SharedPreferences.OnSharedPreferenceChangeListener class GeneralPreferences : PreferenceFragment(), OnSharedPreferenceChangeListener, ^ packages/apps/Calendar/src/com/android/calendar/GeneralPreferences.kt:175:5: error: 'onSharedPreferenceChanged' overrides nothing override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) { ^ packages/apps/Calendar/src/com/android/calendar/alerts/AlertUtils.kt:56:57: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected mgr.setExact(type, triggerAtMillis, operation) ^ packages/apps/Calendar/src/com/android/calendar/alerts/AlertUtils.kt:58:52: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected mgr.set(type, triggerAtMillis, operation) ^ https://android-build.googleplex.com/builds/pending/P54933224/cf_x86_64_phone-userdebug/latest/view/logs/build_error.log Bug: 275409981 Test: local finalization topic + m Change-Id: Idec17650fd6063495375d6a26b720286ef02ec96
2022-10-18[automerger skipped] Fix for warning: unnecessary non-null assertion (!!) on ↵Ryan O'Leary
a non-null receiver am: 65825315bf -s ours am: 66d2a697bb -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/20141994 Change-Id: Iab16c9ceadd963e68ec4968bc3440b7b56c80a5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18[automerger skipped] Fix: warning: unnecessary safe call on a non-null ↵Ryan O'Leary
receiver of type ___. This expression will have nullable type in future releases am: b3cd986426 -s ours am: 11f1d9c72e -s ours am skip reason: Merged-In I5b9e82170b191b116a34405caf715ca2b13c081d with SHA-1 5f4c87cabd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/20141993 Change-Id: I53ddc87f5d27413de9faeaf58c05080253d16b7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17[automerger skipped] Fix for warning: unnecessary non-null assertion (!!) on ↵android-u-beta-1-gplRyan O'Leary
a non-null receiver am: 65825315bf -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/20141994 Change-Id: Ie23502d1fe37688b0cbd36addde16739181c41b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17[automerger skipped] Fix: warning: unnecessary safe call on a non-null ↵Ryan O'Leary
receiver of type ___. This expression will have nullable type in future releases am: b3cd986426 -s ours am skip reason: Merged-In I5b9e82170b191b116a34405caf715ca2b13c081d with SHA-1 5f4c87cabd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/20141993 Change-Id: I55863c6400c653455cf1358600314bba3ddbe3fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Fix for warning: unnecessary non-null assertion (!!) on a non-null receiverandroid-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
Removed multiple instances of unnecessary non-null assertions within the AOSP Calendar app as part of resolving warning messages. Bug: 237017037 Test: manual testing on bramble device and ran: adb shell am instrument -w com.android.calendar.tests With result: com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.093 OK (22 tests) Change-Id: I455b76d79ee1518bb89721099430a0e3e5903faf (cherry picked from commit 505d6d4d32b2e59964b64f2139c6aa733b0aacbc) Merged-In: I455b76d79ee1518bb89721099430a0e3e5903faf
2022-10-07Fix: warning: unnecessary safe call on a non-null receiver of type ___. This ↵Ryan O'Leary
expression will have nullable type in future releases Fixed warnings stemming from use of unnecessary safe calls `?.` on non-nullable types by replacing instances causing warnings with `.` in order to be compatible with future Kotlin releases. Bug: 237017037 Test: manual testing on bramble device and ran `adb shell am instrument -w com.android.calendar.tests' with results: com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.075 OK (22 tests) Change-Id: I5b9e82170b191b116a34405caf715ca2b13c081d (cherry picked from commit 5f4c87cabd62da9a9f797e715abed2750fd55660) Merged-In: I5b9e82170b191b116a34405caf715ca2b13c081d
2022-10-06Fix nullability to reflect platform SDKAlan Viverette
Bug: 249227476 Test: existing Calendar tests Change-Id: I0aced2b25295250ac0c3a15f7e47ff37ab2edef5
2022-09-08Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8 am: d6a974a300 ↵Ryan O'Leary
am: 335b7ee16b am: 25f0469b2c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: I2ad4c354a3efa7df0c7cde59636a36fe53c3bd05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8 am: d6a974a300 ↵main-16k-with-phonesRyan O'Leary
am: 335b7ee16b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: I2e5eaad348683384b2988a8cf7fc32ac8e02c716 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8 am: d6a974a300Ryan O'Leary
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: I76d6c388b0127a49ce543630d488513ccb320374 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8Ryan O'Leary
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: I3f9efa44e57747c68e39e4ee5ade543280f3abbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Remove wrong class cast" am: 60f7ff67a9Ryan O'Leary
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: Icf16890c310b2ecc8d8d8cfe5b891388d12fe980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Remove wrong class cast"main-16kRyan O'Leary
2022-09-07Remove wrong class castMin Yun
- In landscape mode, calendar is crashed. addRule() return void type, so "as RelativeLayout.LayoutParams" is crashed. Change-Id: I21d3129aeeb32b877c0b11591f6517b596303275
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: cdbb4f0c34 ↵Xin Li
-s ours am: 53484f0e9c -s ours am: 3461a63075 -s ours am: 3db32acba8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: Ie06e56e90ce2510c33eb684a5e1c4a9ebff29ab6 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: 849732e6b4 -s ours ↵Xin Li
am: 29a9a5114d -s ours am: 3f190a37e3 -s ours am: ddc164cf55 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: I5cfee7d0e3809578aeb44de2eaf59f3f1a95f40e 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: cdbb4f0c34 ↵Xin Li
-s ours am: 53484f0e9c -s ours am: 3461a63075 -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: I483d121a9d9a6b4b9d04677e4563e23e876905b7 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: 849732e6b4 -s ours ↵Xin Li
am: 29a9a5114d -s ours am: 3f190a37e3 -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: I60cebd1a5e86536ffaeac6ccb7d222a81c5c537c 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: cdbb4f0c34 ↵Xin Li
-s ours am: 53484f0e9c -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: Ieec4d44d7d942f69d663cd6c42dc536adc46756c 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: 849732e6b4 -s ours ↵Xin Li
am: 29a9a5114d -s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: Id46c3c5cc39b21ff13a6a037ebcc3dc5e26ec019 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: cdbb4f0c34 ↵Xin Li
-s ours am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: I39be9d7ed4f567a94de893ade7a720418680c58f 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: 849732e6b4 -s oursXin Li
am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2186783 Change-Id: Iddc2aaf1f6093ee4a933806a8b5d9a6897e9b640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"Xin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I455b76d79ee1518bb89721099430a0e3e5903faf Change-Id: I9f3560edb5f56c703315ae8dc597bc0859820f6b
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵Ryan O'Leary
receiver" am: 184f6f34cb am: d0492ffe01 am: f591695824 am: 2529d159e5 am: d5f11975bd Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2159797 Change-Id: I9df98d7e0f0d42ceeb40685a6250e26b3639e4a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵Ryan O'Leary
receiver" am: 184f6f34cb am: d0492ffe01 am: f591695824 am: 2529d159e5 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2159797 Change-Id: Ia26a58dc2a9de9e730fb31e6fff6e7b10447f1ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵Ryan O'Leary
receiver" am: 184f6f34cb am: d0492ffe01 am: f591695824 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2159797 Change-Id: Ifcd12d9b2d718547658de9686e440240d941398e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵Ryan O'Leary
receiver" am: 184f6f34cb am: d0492ffe01 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2159797 Change-Id: I74d8d365170a0854aba728befb612ab58f525312 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵temp_sam_242648940Ryan O'Leary
receiver" am: 184f6f34cb Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2159797 Change-Id: I0d73c8abc9671abd6f720781e9821dae43899cdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null ↵Ryan O'Leary
receiver"
2022-07-20Fix for warning: unnecessary non-null assertion (!!) on a non-null receiverRyan O'Leary
Removed multiple instances of unnecessary non-null assertions within the AOSP Calendar app as part of resolving warning messages. Bug: 237017037 Test: manual testing on bramble device and ran: adb shell am instrument -w com.android.calendar.tests With result: com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.093 OK (22 tests) Change-Id: I455b76d79ee1518bb89721099430a0e3e5903faf
2022-07-16Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases" am: ba9c44550f am: 738af8dfed am: aad37570b9 am: 1546f93390 am: 252d37a507 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2153717 Change-Id: I06e13f53551611fc6f3d8eb125dedad5b80fc9fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases" am: ba9c44550f am: 738af8dfed am: aad37570b9 am: 1546f93390 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2153717 Change-Id: I2bdd7c5ef68aadb7e3416da2388b349304054767 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases" am: ba9c44550f am: 738af8dfed am: aad37570b9 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2153717 Change-Id: I1d1ad8b1895346302504a3260b0bdbe7948640bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases" am: ba9c44550f am: 738af8dfed Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2153717 Change-Id: Ie298d6e8d3de5ec6e1e30390f8ab2e4fb8b5548b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases" am: ba9c44550f Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2153717 Change-Id: I4d6c50ed12baebb953ce58cc8a771c2b9fdc3fdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ↵Treehugger Robot
___. This expression will have nullable type in future releases"
2022-07-14Fix: warning: unnecessary safe call on a non-null receiver of type ___. This ↵Ryan O'Leary
expression will have nullable type in future releases Fixed warnings stemming from use of unnecessary safe calls `?.` on non-nullable types by replacing instances causing warnings with `.` in order to be compatible with future Kotlin releases. Bug: 237017037 Test: manual testing on bramble device and ran `adb shell am instrument -w com.android.calendar.tests' with results: com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.075 OK (22 tests) Change-Id: I5b9e82170b191b116a34405caf715ca2b13c081d
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
56fb32d8e3 -s ours am: 457a960619 -s ours am: a3a2304fa9 -s ours am: 886d816f67 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/19094734 Change-Id: Ie59a5a3d0d53e915bf69f249baa8b105aff6dfe6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
56fb32d8e3 -s ours am: 457a960619 -s ours am: a3a2304fa9 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/19094734 Change-Id: If600d92cd64d774e7b4c49cc3e6af4674417432f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
56fb32d8e3 -s ours am: 457a960619 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/19094734 Change-Id: Ib9318991fb9e3efa07374221f40a2441ad02cae6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
56fb32d8e3 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/19094734 Change-Id: I1bf6f10d5d63ca7342be87e1305c07c5fa263002 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363Xin Li
Bug: 236760014 Merged-In: I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 Change-Id: Ie880edf795b1575911aedc2414f69715c5a91840
2022-05-10Snap for 8564071 from c95dcf939df9e7a3b87656279f638ecf13787fb9 to ↵aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040android13-mainline-wifi-releaseAndroid Build Coastguard Worker
mainline-wifi-release Change-Id: I85b9988fd1e2f93f42bcb4df7d262d6b61aee0b1
2022-04-29[automerger skipped] Merge "packages/apps/Calendar - Tiramisu is now 33 am: ↵Automerger Merge Worker
fad091f839 am: 5800e892bd" into tm-d1-dev-plus-aosp am: 64e38d630e -s ours am: 807a70e14e -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/17809063 Change-Id: I2648e132857b16ba928279482f38d3f3f8abdc51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29[automerger skipped] packages/apps/Calendar - Tiramisu is now 33 am: ↵Yurii Zubrytskyi
fad091f839 am: 5800e892bd am: 3f89a68dfe -s ours am: 5843aa1341 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/17809063 Change-Id: I5e74df49269f7d483faa0ef9286897bd0ca40abc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29[automerger skipped] packages/apps/Calendar - Tiramisu is now 33 am: ↵Yurii Zubrytskyi
fad091f839 am: a45aad36bb am: b3c8fff079 -s ours am: 61703e5295 -s ours am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/17809063 Change-Id: Iec6edb1d810b9986b1babe8b51f2afee897e7be6 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-28 18:28:02 +0000