aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-11Snap for 8712302 from 11855f3f660ffd08ccdeed8a9fa23509aaa55223 to ↵t_frc_art_330443060android13-frc-art-releaseAndroid Build Coastguard Worker
tm-frc-art-release Change-Id: Ifc5d7322dbfd89eed941fce04edb2f5b6de2523b
2022-05-24Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devandroid13-devTreeHugger Robot
2022-05-23[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
038ec9c99e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/18515535 Change-Id: I638ebd3b7f3b9e382dbd74941187024aa4139b3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6fd4a7bb38ab409b8cd965ee70f25bad4ab10410
2022-05-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I40f6113c28e8118061a624b9c956183af02f3f57
2022-04-28Snap for 8512216 from 0090f0bee325038f71533948888ecd49a52c3eb2 to ↵Android Build Coastguard Worker
tm-frc-art-release Change-Id: I5615ccff8bac758064b314c4e5b9ad555ec94637
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 44fd448427 -s ours ↵Xin Li
am: 0810967e38 -s ours am skip reason: Merged-In Ide2d68d51c388825b0d9ff0fbbe0d5d8f83e0f6e with SHA-1 09448f65b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17544647 Change-Id: I03ac942e85e72ec889efc884af2147dcdb17939c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 44fd448427 -s oursXin Li
am skip reason: Merged-In Ide2d68d51c388825b0d9ff0fbbe0d5d8f83e0f6e with SHA-1 09448f65b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17544647 Change-Id: I72fb975cd617a105d9c289e02db2396732ce5eac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ide2d68d51c388825b0d9ff0fbbe0d5d8f83e0f6e Change-Id: I2112d01f18d537a429b90e9f29081d832562b4a4
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
15ac212aa3 -s ours am: 1c8c7f3d62 -s ours am: 09448f65b5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2043482 Change-Id: I7f97519a8d0376bf381a60936168fca47f107599 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
15ac212aa3 -s ours am: 1c8c7f3d62 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2043482 Change-Id: Ide2d68d51c388825b0d9ff0fbbe0d5d8f83e0f6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5b53f4c7ac -s ours am: 5861162012 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17422175 Change-Id: Ic480b2b7a0f55d791612b4f1fb3e30ec0619afb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
15ac212aa3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2043482 Change-Id: I77b7df36b2a35e0324bf7835b0b6a5d4bf8ae8ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5b53f4c7ac -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17422175 Change-Id: I9a2af270083543067757cc87a73202b49949a4c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I32a48e178d6da1a3731dfa7ae7fe1257cd82dd32
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia261f2692af4fa16d4116e0e0d10637677282fec
2022-03-18[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 8eebc6682b am: 6c292471da -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17213561 Change-Id: Ie7aa8f365f9695c43135f6dd4f5d0de2e9a412d6
2022-03-16[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8eebc6682bBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/17213561 Change-Id: I8dde65e1a060be59d9727b8d05d09a50c5587498
2022-03-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9c0f90395a8b2c390885abfcc0d18fceb00b69dc
2022-03-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0a5297c930b1c95bb89b9f45857536c7a68f1539
2022-03-09[automerger skipped] Merge Android 12L am: e8aa2d5442 -s ours am: 2378c0440c ↵Xin Li
-s ours am: 0af3198d29 -s ours am skip reason: Merged-In I2a6ffed6a72d9f92469427d218fa3c896eadaa8d with SHA-1 18c8a5e083 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2013296 Change-Id: I3a33e6a962ffdb723eb888fbcb75fe84b56b9a5e
2022-03-08[automerger skipped] Merge Android 12L am: e8aa2d5442 -s ours am: 2378c0440c ↵Xin Li
-s ours am skip reason: Merged-In I2a6ffed6a72d9f92469427d218fa3c896eadaa8d with SHA-1 18c8a5e083 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2013296 Change-Id: Id3968329244ef40cc2d4653482199eea331d71f5
2022-03-08[automerger skipped] Merge Android 12L am: e8aa2d5442 -s oursXin Li
am skip reason: Merged-In I2a6ffed6a72d9f92469427d218fa3c896eadaa8d with SHA-1 18c8a5e083 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/2013296 Change-Id: I435c40c34a4750a15c52bc0d1ca03e76368aaa68
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I2a6ffed6a72d9f92469427d218fa3c896eadaa8d Change-Id: Ie8d1a3506a95100a452e9ab89886d411af9bf3ad
2022-02-16Snap for 8190861 from dff98d24d443d87d79462b477d17eb2f122e4e04 to ↵Android Build Coastguard Worker
tm-frc-art-release Change-Id: I1432c73b02bea61c2a17bc09b07e0827cefada54
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
18c8a5e083 -s ours am: 41f72550ec -s ours am skip reason: Merged-In I3600e2c97b35f3269e7d03d5e6e4b0e2826eaf36 with SHA-1 72ce8eb29c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16845176 Change-Id: I2b2eb2044fb6ac01dcc374e30cd1ea8205d17796
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
18c8a5e083 -s ours am skip reason: Merged-In I3600e2c97b35f3269e7d03d5e6e4b0e2826eaf36 with SHA-1 72ce8eb29c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16845176 Change-Id: I4b9fade783e854eb3fe09ae17574d81f561ac958
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I3600e2c97b35f3269e7d03d5e6e4b0e2826eaf36 Change-Id: I2a6ffed6a72d9f92469427d218fa3c896eadaa8d
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72ce8eb29c -s ours am: f9be74e39d -s ours am: e018301b0e -s ours am: d8b39bd3ba -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1943724 Change-Id: I72ec65a012cb5f412b78af84cab8fc8a6918218e
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72ce8eb29c -s ours am: f9be74e39d -s ours am: e018301b0e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1943724 Change-Id: Ib3a2659107a7ccb7dfee3963e0a37314e4793de3
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72ce8eb29c -s ours am: f9be74e39d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1943724 Change-Id: Ia92bd36305f882d721ac717d8bb1fc90fa8d2139
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f08121b9ca -s ours am: 9950204f06 -s ours am: b34a472617 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16597121 Change-Id: I5ac7e7aa22b51e9c955a2d4e3267f659bddcdf04
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f08121b9ca -s ours am: 9950204f06 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16597121 Change-Id: Ic4e720e2a0a704d2aa5a90355a636154d6003ef0
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72ce8eb29c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1943724 Change-Id: I8ee5ed49cd97da2ad63abca812745efbf89c409a
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f08121b9ca -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16597121 Change-Id: I2e01816db958b4d187fabf60768ede8fcb67a599
2022-01-10Import translations. DO NOT MERGE ANYWHEREandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bill Yi
Auto-generated-cl: translation import Change-Id: I3600e2c97b35f3269e7d03d5e6e4b0e2826eaf36
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I82af156eb095d2b625de02e4759cc4db3e0c4e14
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 8d3fcb2c92 -s ours am: ↵Xin Li
14bd268242 -s ours am: bc0858f452 -s ours am: 888a4c3aa3 -s ours am skip reason: Merged-In I365f7674b156509a47aebcf455d31b91cdf0978f with SHA-1 24541ab220 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1921964 Change-Id: I5a18c15fe2a05cfdae8212ff972c11264ef8a71e
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 8d3fcb2c92 -s ours am: ↵Xin Li
14bd268242 -s ours am: bc0858f452 -s ours am skip reason: Merged-In I365f7674b156509a47aebcf455d31b91cdf0978f with SHA-1 24541ab220 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1921964 Change-Id: I985c27dc4c8e04f726cdc69093b2e491c6f915b2
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 8d3fcb2c92 -s ours am: ↵Xin Li
14bd268242 -s ours am skip reason: Merged-In I365f7674b156509a47aebcf455d31b91cdf0978f with SHA-1 24541ab220 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1921964 Change-Id: I15604ce5ca9dbb5e832bf94c2d7610b2b24db468
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 8d3fcb2c92 -s oursXin Li
am skip reason: Merged-In I365f7674b156509a47aebcf455d31b91cdf0978f with SHA-1 24541ab220 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/1921964 Change-Id: I5ac5a17e068205a9d728d0618a86f9eebbbbc87e
2021-12-14Merge Android 12 QPR1Xin Li
Bug: 210511427 Merged-In: I365f7674b156509a47aebcf455d31b91cdf0978f Change-Id: I133238a8bcbbd048f053234cddd5d2bdd61a278e
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
24541ab220 -s ours am: a19914ba97 -s ours am: 44b8e14e6c -s ours am skip reason: Merged-In I60c4ca6dd51351e3c3d532cd61aac93ead556b7a with SHA-1 888a6aea42 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16279013 Change-Id: I312f25a74018c13007fe8382b79f08f828f82890
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
24541ab220 -s ours am: a19914ba97 -s ours am skip reason: Merged-In I60c4ca6dd51351e3c3d532cd61aac93ead556b7a with SHA-1 888a6aea42 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16279013 Change-Id: I468622243bd48130495cd6413ab8108e854d1931
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
24541ab220 -s ours am skip reason: Merged-In I60c4ca6dd51351e3c3d532cd61aac93ead556b7a with SHA-1 888a6aea42 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16279013 Change-Id: Id5df6536eb217138be2959c736a328f8be28c465
2021-11-18Merge changes from topic "am-2bba9f749da44053953c1eae533a9205" into ↵Automerger Merge Worker
sc-v2-dev-plus-aosp am: 3be400f1ac Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16282590 Change-Id: I4b76f19791de501f6823d343593fda716179d3a0
2021-11-18[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 7ab51fa080 am: f7f85250ed -s ours am: db134e0e30 -s ours am: 11227f6848 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16282590 Change-Id: I4d5ccff2d7aae761c1e41ea9911d0b47c9b100a8
2021-11-18Merge changes from topic "presubmit-am-8f203ed197274d70942ca93cc079606e" ↵TreeHugger Robot
into sc-qpr1-dev am: 13592f1fa5 am: 33fc5cc57a am: c2ff29a972 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16282590 Change-Id: Ib39f40ca1179271eece85d6afe228cef3da7a1bd
2021-11-18[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 7ab51fa080 am: f7f85250ed -s ours am: 498f327aa2 -s ours am: 4652ec67c5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16282590 Change-Id: I4900c4efcbc960a788b7781d2054fa0b551b3810
2021-11-18Merge changes from topic "am-2bba9f749da44053953c1eae533a9205" into ↵Automerger Merge Worker
sc-v2-dev-plus-aosp * changes: Merge changes from topic "presubmit-am-8f203ed197274d70942ca93cc079606e" into sc-qpr1-dev am: 13592f1fa5 am: fad6c5a493 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7ab51fa080 am: f7f85250ed -s ours am: db134e0e30 -s ours