summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ib7f6bc25aba01a9ebd87ee2a8664d60963290d11
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ic3eb5c05e53fe118b4c3dfcd869b11763efeec0c
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ia8fe642ec6e5112ee58fedbc2482bcb41b898d39
2020-11-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I002fa3f88de8d70a82c973d4b15d4df21761cab8
2020-11-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9dec1329e963be52f55a44fb733d628a518a5601
2020-11-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0faccc2b0c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13113525 Change-Id: Iea4ba5fd5a04f9ca46f699bd81a916c6db2ac37d
2020-11-23Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ice77bb78ad2552ff03b77de4810c4011d60362f9
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li
Bug: 172690556 Merged-In: I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 Change-Id: If99b96cc09d8b4c3656cbfad808bd59fc480157b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7e1659f1f4 -s ours am: ↵Xin Li
345c521078 -s ours am skip reason: Change-Id I344aa092050cfa3ee3c2a411113655c8f5119a45 with SHA-1 6fd4288c51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12797354 Change-Id: I3fad220aa64f5abc329eaac403b276f5ab775ede
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7e1659f1f4 -s oursXin Li
am skip reason: Change-Id I344aa092050cfa3ee3c2a411113655c8f5119a45 with SHA-1 6fd4288c51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12797354 Change-Id: I81e41a2c90269325da0c690892e85bd0d936abef
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I344aa092050cfa3ee3c2a411113655c8f5119a45 Change-Id: I4ffc665ee46b68e2864f453ec0da0fa5baa8c435
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 4116ceb8c4 am: 0e3db3b687 -s ours am: 61a7afd407 -s ours am: 97309013c4 -s ours am skip reason: Change-Id Iff1e6753c22c9a6f5761a65584d74c29334b99ab with SHA-1 10aff55529 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1431519 Change-Id: I80d25d3862efb1b3a0f513e1d4ea70c487af2c29
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 4116ceb8c4 am: 0e3db3b687 -s ours am: 61a7afd407 -s ours am skip reason: Change-Id Iff1e6753c22c9a6f5761a65584d74c29334b99ab with SHA-1 10aff55529 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1431519 Change-Id: Iea46ba2ffb3a7e95524f3271d020041ad8e522bb
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 4116ceb8c4 am: 0e3db3b687 -s ours am skip reason: Change-Id Iff1e6753c22c9a6f5761a65584d74c29334b99ab with SHA-1 10aff55529 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1431519 Change-Id: I6f49486a1c747fa9ab3263bf4c832de4c2817166
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: 4116ceb8c4Bill Yi
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1431519 Change-Id: I5fe2782b911eda3765e2c209563e3d2ebaf56d8e
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEBill Yi
Merged-In: Iff1e6753c22c9a6f5761a65584d74c29334b99ab Change-Id: I137ee7726d0930847c96f5e4cdca92fcae7cb328
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 6dc2a00b46 -s ours am: 10aff55529 -s ours am: 05b0b4bba5 -s ours am skip reason: Change-Id Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 with SHA-1 c97af9685f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12579280 Change-Id: I6ce2e7c2cfe04a45a347fd11bb96e57a6d937612
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 6dc2a00b46 -s ours am: 10aff55529 -s ours am skip reason: Change-Id Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 with SHA-1 c97af9685f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12579280 Change-Id: I81afe3ec422b329d369fa3bfb7fa74a206e25024
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 6dc2a00b46 -s ours am skip reason: Change-Id Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 with SHA-1 c97af9685f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12579280 Change-Id: Iff1e6753c22c9a6f5761a65584d74c29334b99ab
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 Change-Id: Ieb4b5e192c9215a5a81cde56732f22bee9fbd2e6
2020-09-11[automerger skipped] Merge Android R am: 6e56ff26c7 -s ours am: 313859089a ↵Xin Li
-s ours am: c97af9685f -s ours am: b10e32a40f -s ours am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1421767 Change-Id: I64f193147d6081c3b9b88b83914fe422f4a51e39
2020-09-11[automerger skipped] Merge Android R am: 6e56ff26c7 -s ours am: 313859089a ↵Xin Li
-s ours am: c97af9685f -s ours am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1421767 Change-Id: Ibeadc90a0dbad8df18ce446b36d4e3414f4c48e9
2020-09-11[automerger skipped] Merge Android R am: 6e56ff26c7 -s ours am: 313859089a ↵Xin Li
-s ours am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1421767 Change-Id: Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5
2020-09-11[automerger skipped] Merge Android R am: 6e56ff26c7 -s oursXin Li
am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1421767 Change-Id: I9d700d04580fe757dd9b968b39ad26ea47bd8589
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ia2a3906818c66adc28c14047af395289306da9aa Change-Id: I66dfbfc59576c5776855cae75638c5d74480c08a
2020-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
6b88af0469 -s ours am: 6e9b1146e4 -s ours am: b9c48c20f8 -s ours am: f939a68dc2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1419932 Change-Id: Iac4b2a66bd9a149373a737947422f04d708d7309
2020-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
6b88af0469 -s ours am: 6e9b1146e4 -s ours am: b9c48c20f8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1419932 Change-Id: I921728cfef0c885526da3479046219ab46f71426
2020-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
6b88af0469 -s ours am: 6e9b1146e4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1419932 Change-Id: I778d7337f3fa3a7d95dd02af0ee99d84f2d05aac
2020-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵temp_sam_168057903Bill Yi
6b88af0469 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1419932 Change-Id: Ia2a3906818c66adc28c14047af395289306da9aa
2020-09-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0786f043874c0c29c523aa2a26cf34fdda6bbfb4
2020-09-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
80137eb910 -s ours am: d654a30210 -s ours am: 16f38fcec6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12520953 Change-Id: I45e113fb0e437b052fb7eb4921921741cf2db08a
2020-09-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
80137eb910 -s ours am: d654a30210 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12520953 Change-Id: I3f5fb706df7daf169e3a589f898737cb1994ba08
2020-09-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
80137eb910 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12520953 Change-Id: Ibf62b35ec3cb979b2aaddfe74e103bd587a31645
2020-09-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I38774ae0266df579f48904de5a84d11b06e91365
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 35737e3de7 -s ours am: 14d5d5e851 -s ours am: 1a2c0d1c5e -s ours am skip reason: Change-Id Idbdf32ee4972daa81ea3ff3a19dcb8528283b692 with SHA-1 d05859b843 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12470179 Change-Id: I375c8ed24e0742deb79df752a6591e1bb9247c41
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 35737e3de7 -s ours am: 14d5d5e851 -s ours am skip reason: Change-Id Idbdf32ee4972daa81ea3ff3a19dcb8528283b692 with SHA-1 d05859b843 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12470179 Change-Id: I1bb372729bb554815af76bcdc069a57e8faf6051
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 35737e3de7 -s ours am skip reason: Change-Id Idbdf32ee4972daa81ea3ff3a19dcb8528283b692 with SHA-1 d05859b843 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12470179 Change-Id: Iddbf5c45d9d8d414042a3b6d53003c15b71ad4bc
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: Idbdf32ee4972daa81ea3ff3a19dcb8528283b692 Change-Id: I2ce987573e7e4e2084f79046ae4504d4cdc23485
2020-07-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e6e377a4cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12233513 Change-Id: I92af65ddd11a4cbfc2c75cbf9d6e83325cde1490
2020-07-25Import translations. DO NOT MERGE ANYWHEREandroid-11.0.0_r30android11-qpr1-c-releaseBill Yi
Auto-generated-cl: translation import Change-Id: Ic53104610d9a03ae284ce587feab67ade5d8c0f7
2020-07-07Snap for 6657497 from 3185839a0fe2d07970ce213bc1c6369836572fba to ↵r_aml_301500702android-mainline-11.0.0_r9android-mainline-11.0.0_r6android-mainline-11.0.0_r4android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid-build-team Robot
mainline-release Change-Id: I861d1a63b6c8fd92f4eeccbad966753716050fef
2020-07-07Merge "[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a ↵Automerger Merge Worker
-s ours am: f598f5bff0 -s ours am: f9f38fc6b2 -s ours" into rvc-d1-dev-plus-aosp am: f6fc28fc06 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I515e0f05d60c9e789d1b5f7c4287eaf3ef55b171
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: f598f5bff0 -s ours am: d05859b843 -s ours am: 2582708a54 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I433478c23d0d134a488b81691fa6102d142b1b37
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: f598f5bff0 -s ours am: f9f38fc6b2 -s ours am: ecf38f9705 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: Ibac9a878390d63ac124f63af212ff920e94bb0ce
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: f598f5bff0 -s ours am: f9f38fc6b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I66e52b2d41963ce38c586a839a14ac8ba23a97cd
2020-07-07Merge "[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a ↵Automerger Merge Worker
-s ours am: f598f5bff0 -s ours am: f9f38fc6b2 -s ours" into rvc-d1-dev-plus-aosp
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: f598f5bff0 -s ours am: f9f38fc6b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I344aa092050cfa3ee3c2a411113655c8f5119a45
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: f598f5bff0 -s ours am: d05859b843 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I96658b74aa625c8a21b46b6b4bd81d387a17f1c1
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵Bill Yi
ours am: 2ec600c2a7 -s ours am: 84fab49f8b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: I0cbf4300de789a3dd925b6093be8aa0af5d19900
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵android-mainline-11.0.0_r35Bill Yi
ours am: f598f5bff0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: Ib45395c8be525f228e4639dbd43d9068dcc0000e