summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478067 from 5729362442e88937f0d28853772c4b9cee5feddf to ↵android-mainline-12.0.0_r86android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r60android-mainline-12.0.0_r43android-mainline-12.0.0_r24android-mainline-12.0.0_r116android-mainline-12.0.0_r101android12-mainline-cellbroadcast-releaseandroid-build-team Robot
mainline-cellbroadcast-release Change-Id: I15fd0be6bcbf7e3cbc0660bd75cbbc8786241b5d
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
804b0c25f2 am: 9cdf0df32f am: 9ef53f533e am: cf0fdce0de Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211 Change-Id: Iada102d7c4a8b3416527b595721d214eb6fd6eb4
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: ↵android12-devTreehugger Robot
804b0c25f2 am: 9cdf0df32f am: 9ef53f533e Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211 Change-Id: I874ad5a547eec2304591349d7174cfbfdc66132c
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: ↵Treehugger Robot
804b0c25f2 am: 9cdf0df32f Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211 Change-Id: I81a4759e5369be6e29f1aac3390b76f817f3d866
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: 804b0c25f2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211 Change-Id: I9db7379dea3e7f0cbf4940227ac3f0a94b739327
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/CalendarBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.mk tests/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I17cbdab4a5eaa0906fe9ad7a57e82885bba1e541
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 23682675c2 -s ↵Xin Li
ours am: 60ff0cc4f5 -s ours am: ca4cab48ed -s ours am skip reason: Change-Id I16af5a75f149e12e724ae9ec5839b26716cf1be0 with SHA-1 c419771500 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6434f11d32c48229438ed9640aa854e5e508ef8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 23682675c2 -s ↵Xin Li
ours am: 60ff0cc4f5 -s ours am skip reason: Change-Id I16af5a75f149e12e724ae9ec5839b26716cf1be0 with SHA-1 c419771500 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I743adde827e53a32a9b31bf52515e867259888e7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 23682675c2 -s oursXin Li
am skip reason: Change-Id I16af5a75f149e12e724ae9ec5839b26716cf1be0 with SHA-1 c419771500 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d6960d124f924376290ca914fa5ad50a8ef9a88
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I16af5a75f149e12e724ae9ec5839b26716cf1be0 Change-Id: I8dac8307cbc7ac7b050c5068ae7c5e5d93802b08
2020-11-23Mark ab/6881855 as merged am: 8a9e602ccf am: c419771500Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/13112954 Change-Id: I3202169051fd2ff7e976acc3f43a5d57216a06ee
2020-11-23Mark ab/6881855 as merged am: 8a9e602ccfXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/13112954 Change-Id: I16af5a75f149e12e724ae9ec5839b26716cf1be0
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ie45d5df4f406757cd5c38e9f39a28e21e6aa46ba
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dbcf536931 -s ours am: ↵Xin Li
00c5894168 -s ours am: 4f4d087c11 -s ours am skip reason: Change-Id I4485ef0f8099687c3213ea21d9ed8b4ba2cc6731 with SHA-1 15122e1a29 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12796901 Change-Id: I5afe5b6b515d4e0d3e0410f330ee49269e43a12d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dbcf536931 -s ours am: ↵Xin Li
00c5894168 -s ours am skip reason: Change-Id I4485ef0f8099687c3213ea21d9ed8b4ba2cc6731 with SHA-1 15122e1a29 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12796901 Change-Id: I95b684d4ce716b67bba4db8af436f1bb8f9c4edf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dbcf536931 -s oursXin Li
am skip reason: Change-Id I4485ef0f8099687c3213ea21d9ed8b4ba2cc6731 with SHA-1 15122e1a29 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12796901 Change-Id: I6a066120dc553175263d1cbffc475a404244094d
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I4485ef0f8099687c3213ea21d9ed8b4ba2cc6731 Change-Id: I21b4e7d8969cef32a11e50902ced9138f3dc3e02
2020-09-11[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: ↵Xin Li
fcb79c23d2 -s ours am: 38eafb3ec8 -s ours am: 1c76f92041 -s ours am: 92907fa5a2 -s ours am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: I130bdc70739adb7fcec41671292c069dce2c65a5
2020-09-11[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: ↵Xin Li
fcb79c23d2 -s ours am: 38eafb3ec8 -s ours am: 1c76f92041 -s ours am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: I77cfd9bdaed50b6eb040f5f31029986b272a1861
2020-09-11[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: ↵Xin Li
fcb79c23d2 -s ours am: 38eafb3ec8 -s ours am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: Id7224aebc7e60df73aa726ef8214d57315e9dd81
2020-09-11[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: ↵Xin Li
fcb79c23d2 -s ours am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: Iefdfd09ba34004a140c8d5f84e904b7089f6ab1d
2020-09-11[automerger skipped] Merge "Merge Android R" am: ed293f028d -s oursXin Li
am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: I48853c359f2eaeb8934fa2b79d507843f605a840
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I1da6f480b01ed3afe1fa4fb5af78044945a51540 Change-Id: I92f69af79956d496cafbcc9f5f4592febaea52dc
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f0c35e00ec -s ours am: ea2cc7ee0b -s ours am: 045625f16a -s ours am: 3ecbac1f75 -s ours am skip reason: Change-Id I25a69ac99dc29101979d772e91feb440d1a16614 with SHA-1 0525c2bbde is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12470247 Change-Id: I8a93ad2b5a693ad54e900ed3f3d670a465b36e3b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f0c35e00ec -s ours am: ea2cc7ee0b -s ours am: 045625f16a -s ours am skip reason: Change-Id I25a69ac99dc29101979d772e91feb440d1a16614 with SHA-1 0525c2bbde is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12470247 Change-Id: I98eb502cee3a93f4f620dddb233bbf77932df4a6
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f0c35e00ec -s ours am: ea2cc7ee0b -s ours am skip reason: Change-Id I25a69ac99dc29101979d772e91feb440d1a16614 with SHA-1 0525c2bbde is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12470247 Change-Id: I5e864ae2b566408d6b13e1d3785eb548d0f8f1cc
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f0c35e00ec -s ours am skip reason: Change-Id I25a69ac99dc29101979d772e91feb440d1a16614 with SHA-1 0525c2bbde is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12470247 Change-Id: I0718ece308fb5023293f82a72ad6857365786450
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I25a69ac99dc29101979d772e91feb440d1a16614 Change-Id: I1da6f480b01ed3afe1fa4fb5af78044945a51540
2020-08-26[automerger skipped] Merge "Merge stage branch to development trunk." am: ↵Treehugger Robot
a5155129a9 -s ours am: 46f40a1867 -s ours am: e2b1314bee -s ours am: 279af0549f -s ours am: eaf117a6b9 -s ours am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1409408 Change-Id: I005f61db42cc2b35f9946659621fb4355f8eeb87
2020-08-26[automerger skipped] Merge "Merge stage branch to development trunk." am: ↵Treehugger Robot
a5155129a9 -s ours am: 46f40a1867 -s ours am: e2b1314bee -s ours am: 279af0549f -s ours am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1409408 Change-Id: I4050096379c8f2c0d17ab8719e9381a4cd008469
2020-08-26[automerger skipped] Merge "Merge stage branch to development trunk." am: ↵Treehugger Robot
a5155129a9 -s ours am: 46f40a1867 -s ours am: e2b1314bee -s ours am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1409408 Change-Id: Iea4f4915f88fe8664b240e59a8f82f1c5bfeb710
2020-08-26[automerger skipped] Merge "Merge stage branch to development trunk." am: ↵Treehugger Robot
a5155129a9 -s ours am: 46f40a1867 -s ours am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1409408 Change-Id: Id0e6bef8d71e711d67e292ed50cdb2add15f5694
2020-08-25[automerger skipped] Merge "Merge stage branch to development trunk." am: ↵Treehugger Robot
a5155129a9 -s ours am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1409408 Change-Id: Idf0cb77a905e18d73473f36494c27842530177ec
2020-08-25Merge "Merge stage branch to development trunk."Treehugger Robot
2020-08-24Merge stage branch to development trunk.Xin Li
Bug: 160260413 Merged-In: Iaeca9b46eb05073fc497dc29926f04aaf485b396 Change-Id: I49ab232a7999c7c0c2e7fae05d6d5055ae78be3f
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance" am: 27e95b5dbf am: ba0de0dcf3 am: 1b28026e0e am: 15122e1a29 am: f04069646b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918 Change-Id: I6dae80f3fc928ce094fcb7ff3df86d20911067ef
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance" am: 27e95b5dbf am: ba0de0dcf3 am: 1b28026e0e am: 15122e1a29 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918 Change-Id: I21f07bbc459e9483c795015cc86de0ca129a8eb9
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance" am: 27e95b5dbf am: ba0de0dcf3 am: 1b28026e0e Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918 Change-Id: I4485ef0f8099687c3213ea21d9ed8b4ba2cc6731
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance" am: 27e95b5dbf am: ba0de0dcf3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918 Change-Id: I9534d5da95be6b50530c54ef62a183a851a990ac
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵temp_sam_160260413Treehugger Robot
language guidance" am: 27e95b5dbf Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918 Change-Id: Iaeca9b46eb05073fc497dc29926f04aaf485b396
2020-07-28Merge "AOSP/Calendar - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance"
2020-07-28AOSP/Calendar - Update language to comply with Android's inclusive language ↵Raman Tenneti
guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ make CalendarTests -j $ ls -l out/target/product/bonito/product/app/Calendar/Calendar.apk out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -g out/target/product/bonito/product/app/Calendar/Calendar.apk $ adb install -r -d -g out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests Time: 0.127 OK (22 tests) Change-Id: I120568d69f9b2cbf63c1846e4113b32e8cd3a35c
2020-07-23[automerger skipped] Merge "Fix multiple substitutions in positional format ↵Treehugger Robot
- DO NOT MERGE ANYWHERE" am: 13209dae16 -s ours am: a00c817340 -s ours am: 7427fe63cb -s ours am: 58ad53a689 -s ours am: 6ab85b226c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1361698 Change-Id: If970bf5b702325425583bf90231bc81b8e509538
2020-07-23[automerger skipped] Merge "Fix multiple substitutions in positional format ↵Treehugger Robot
- DO NOT MERGE ANYWHERE" am: 13209dae16 -s ours am: a00c817340 -s ours am: 7427fe63cb -s ours am: 58ad53a689 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1361698 Change-Id: I83a52eccfdeb4b044d5bca7edcbbcdfd2418e08f
2020-07-23[automerger skipped] Merge "Fix multiple substitutions in positional format ↵Treehugger Robot
- DO NOT MERGE ANYWHERE" am: 13209dae16 -s ours am: a00c817340 -s ours am: 7427fe63cb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1361698 Change-Id: Ia9334cfa85c099be559ef64efe1b761a977455ff
2020-07-23[automerger skipped] Merge "Fix multiple substitutions in positional format ↵Treehugger Robot
- DO NOT MERGE ANYWHERE" am: 13209dae16 -s ours am: a00c817340 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1361698 Change-Id: I5168e860ca170d2de2acbf4fac78d03bcecc650d
2020-07-23[automerger skipped] Merge "Fix multiple substitutions in positional format ↵Treehugger Robot
- DO NOT MERGE ANYWHERE" am: 13209dae16 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1361698 Change-Id: I1eb2c3848d135fd08f5f9015967ad49a4283d6ea
2020-07-23Merge "Fix multiple substitutions in positional format - DO NOT MERGE ANYWHERE"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:10:52 +0000