summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-18DO NOT MERGE - Merge RQ3A.210605.005android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
Bug: 190855093 Merged-In: I8aa1e69db4609d72463a59c359af2ff7622dfa8a Change-Id: I1fecc08fafaf47b16ed69cff7a0c28b97a2a5ab8
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: Ic24223bc90e24f24f54bd865057ce0de563874e2 Change-Id: I8aa1e69db4609d72463a59c359af2ff7622dfa8a
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5 Change-Id: Ic24223bc90e24f24f54bd865057ce0de563874e2
2021-04-22[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
b215ae5da7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1683931 Change-Id: I1accd57250c44512e298bd083e786324b5d2b65c
2021-04-22Import translations. DO NOT MERGE ANYWHEREandroid-s-beta-2android-s-beta-1Bill Yi
Auto-generated-cl: translation import Change-Id: Idf93f99458826db13eab0cec751472e42bbd4d5b
2021-04-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I93f77c117a454134db015f7c57b90151ee38f63c
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 262ed452c6 -s ours am: ↵temp_ab_7272582Xin Li
25d77e0210 -s ours am skip reason: Change-Id I9b358384c2cee20896ea615ceb672755770724d0 with SHA-1 7b49a3b5fd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1613634 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I34a09b09f96b91354e353c6831ebbc67b6d437dd
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 262ed452c6 -s oursXin Li
am skip reason: Change-Id I9b358384c2cee20896ea615ceb672755770724d0 with SHA-1 7b49a3b5fd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1613634 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a717cfb9e18392af4b975d50bd83ea7af1b185b
2021-03-03Merge RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I9b358384c2cee20896ea615ceb672755770724d0 Change-Id: I726c160ad22b791463fbe7b71e4c03a0da22a3d4
2021-02-27Snap for 7173881 from c1fd553292eeccf79a9453221f1c55d7bf021fa6 to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: I4c890563c06ee7d4a6edcd012dbbd1107380bde1
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am: 723c82f7a9 -s ours am: c1fd553292 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a70c7bd605a87f4953d57268b388ba1cc6eaa04
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am: 30e260838c -s ours am: 0afccd5658 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib13886a310b5ad4021a20e7246d1ae372a0001d6
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am: 723c82f7a9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I82ce29d510223283c547b34741ece8d39c0b1a1c
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am: 30e260838c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I607cc03ca6dc42b34c3feb647cf9297bc536944d
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d09da391bb -s ours am: acc03c6933 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706297 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieccfdfa83127ffd999b92363e114155a5bf487d0
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9cd0e3f7d36736129e17e7e8dd299c07436976de
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am: 8ca3333dd0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I37bd14ac3815cf48305e3126739744bb60255a30
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am: 31e100cca2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic0d02c2fab3dfdf31eb7f6d533a2aa07a6d9ade2
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d09da391bb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706297 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99dc49f93d04a124a4862801cb2c485d2b8c261d
2021-02-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
401cbf9738 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13706296 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idf2d5a0da9ea3c596abdcba026b705c06b79702b
2021-02-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9da5292137a38f6d1a505d4f3427470e8bc3b914
2021-02-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I30e7c6c405fa6cb3f0a7b6d4e2ce7b80503983b4
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 7b49a3b5fd -s oursXin Li
am skip reason: Change-Id I0e0638bed7782fc2326c8db36340fcb72c2ef425 with SHA-1 6b3fc3939b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13658372 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee1ce4a4c314b684ef9da8f59fa300523134ebb1
2021-02-21Merge ab/7061308 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I0e0638bed7782fc2326c8db36340fcb72c2ef425 Change-Id: I9b358384c2cee20896ea615ceb672755770724d0
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Car/SystemUpdater am: ↵Bob Badour
e13027f9f3 am: e346135599 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1588495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8f8db13b577c0a9c818344f1db91137b0a06382
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Car/SystemUpdater am: e13027f9f3Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1588495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5369652fd234caf1acf684c65d427f23bc53a65b
2021-02-13Snap for 7143880 from 55a363ff864054daa889f517b365937065219301 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I93261675924ff4702780ef41a0a41387459e7d7e
2021-02-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
55a363ff86 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13563636 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If2806342a46488c07a6e9906cba4a4cdf8ae0e46
2021-02-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic99f68d6b53592c9ed6cc456435d8342231b82a3
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Car/SystemUpdaterBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I01330c9e541f4b852f9745df3313b407f29d679c
2021-01-16Snap for 7086392 from a707df732515860a44d900ef79a4b70ecd94eff4 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I3eb5998dcfa08e120977b303ca8de4af037521fd
2021-01-16Merge "Allow injected settings icon to be tinted" into qt-car-dev am: ↵TreeHugger Robot
6ead6ffdab am: a707df7325 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13357538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If7c4d3e41c57194cf5ff07eb9a8e299e2adc6a97
2021-01-16Merge "Allow injected settings icon to be tinted" into qt-car-dev am: 6ead6ffdabTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13357538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib173af102826f1e396cae5b804e31a85a6cf0106
2021-01-15Merge "Allow injected settings icon to be tinted" into qt-car-devTreeHugger Robot
2021-01-15Allow injected settings icon to be tintedAlex Stetson
To allow for the injected icon to be easily visible inside of CarSettings, it should be tintable. Bug: 174118110 Bug: 177508455 Test: manual Change-Id: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5 Merged-In: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5
2020-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
84ec51dee8 -s ours am: 6723f216e0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1519188 Change-Id: I0e0638bed7782fc2326c8db36340fcb72c2ef425
2020-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android-s-preview-1Bill Yi
84ec51dee8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1519188 Change-Id: If935b66beed287d8b6a07fe7f31afac0fb927926
2020-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied4a8c544b967556f98caa467478d7f08d9c6acd
2020-12-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3682ce2bf0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13165378 Change-Id: I025178194e9a4fc3a934f02507dd8e5b56a4f491
2020-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id7f9a4d2e88f12e9fe9e07f31fe5704b258c7b8f
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
a252477bfa -s ours am skip reason: Change-Id I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 with SHA-1 033cb74778 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13120509 Change-Id: I1310251270a651c21b4eb2f2c10902607cfeff1f
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: 7d43e8a654 -s ours am: eb14fd37d7 -s ours am: b03ecf2af5 -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: I9d91f6f99daa5e7a8d6b480dd7722355af698e48
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: 7d43e8a654 -s ours am: eb14fd37d7 -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: I667dbb02f3684bc5759977860d07f3db986ac7f9
2020-11-26[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
qt-car-dev am: 2ba3bf2338 -s ours am: 866d412fdc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132610 Change-Id: Ic75702e1b6a0553a28e98257ba8a29c7bb069f51
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: 241043221e -s ours am: b996b6fe32 -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: Iad06158429ea3583aa5657fbc3568988a17dbd39
2020-11-26[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
qt-car-dev am: 2ba3bf2338 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132610 Change-Id: Ic22b439bc4e5de204059f6068a571be925e38f34
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: 7d43e8a654 -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: I01a32ffe23036cc41e72c90039e76db85b90b215
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: 241043221e -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: I2c0f1913b9fca632b927ed163fe315b73bb50a70
2020-11-26Merge "Import translations. DO NOT MERGE ANYWHERE" into qt-car-devTreeHugger Robot
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: I1837076d506586e00cafda86b4d1854ed122fbd9