summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: Ie63ad198bb7dd6cbb67309a7fab50af490c81520 Change-Id: Iee95e25f29b176d740706a4223292c4efb5cf788
2022-12-19Override the correct dpi for Raven_car. am: 7df07e9573Yuncheol Heo
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/20768346 Change-Id: Ia033b38bace9114d8ff578bc7dcb084b8f68f8cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Override the correct dpi for Raven_car.android-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-releaseYuncheol Heo
- Raven defines the lcd density in displayconfig. Adds the new displayconfig to set the correct dpi for Phone_car. Bug: 260168947 Test: builds raven_car and check if SUW has the correct size. Change-Id: Ie63ad198bb7dd6cbb67309a7fab50af490c81520 (cherry picked from commit 01db5387155fb1da0fa9d944503c71128fc0098d) Merged-In: Ie63ad198bb7dd6cbb67309a7fab50af490c81520
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 7451c312a3 -s ours am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243 Change-Id: Ifd2a253c8775350d2ac53836c10750c36c216d4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s ours am: ↵Xin Li
1fe26964aa -s ours am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243 Change-Id: I7d16eb204739e32aa6546dc23ba4c9618c7e916c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s ours am: ↵Xin Li
da585bc6c7 -s ours am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243 Change-Id: I34a22f5782e2b6a53c39deceed3260d5122fdda5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s oursXin Li
am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243 Change-Id: I812228760bfda0b67605e32790f174bd56d102e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s oursXin Li
am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243 Change-Id: Ie32f815c9916989bd66b7e5be02e83d76d001349 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f Change-Id: I54d86cae3da668a5b8d96dbad8e5f61ca348468d
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
46b575c92a -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/20136469 Change-Id: Ib5e8a07a4a4c0b6bc646393a2d6b0dc291d82e0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32 Change-Id: I197005aa837d502942094b071cae2b97c7a71d41
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 70e0e9c291 -s ours ↵Xin Li
am: 8bff353afc -s ours am: b5c553ef4e -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2185749 Change-Id: I17ffc193d3f8e934d53edbe726a7acfeb6bff636 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: 70e0e9c291 -s ours ↵Xin Li
am: 8bff353afc -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2185749 Change-Id: I50b6ad4aba5e6d8247314e3ca37a030be1bc2cb8 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: 70e0e9c291 -s oursXin Li
am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2185749 Change-Id: I4bd00ccbde2739cc8851c18be93026d523b7ecc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13main-16kXin Li
Bug: 242648940 Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32 Change-Id: I6eba662a786abd6e4b3f3717163a3d792adf0da9
2022-07-28Add support for bluejay_car builds am: de1dda9735Gaurav Sarode
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/19441767 Change-Id: Iea532bdb249c81eeb50be01dc376b274cb56d5a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27Add support for bluejay_car buildsandroid-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseGaurav Sarode
bug: 240318130 Test: Local build and boot Change-Id: I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f
2022-07-15Raven/Oriole change the Boardconfig architecture am: f85e03fa0cGaurav Sarode
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/19271872 Change-Id: Ib56e428fe8d949c03be1931e5968ca2213b8e4a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Raven/Oriole change the Boardconfig architectureGaurav Sarode
bug: 227488008 Test: local build and wifi works Change-Id: Idd3c555cc788ef5e2cfc20a1300c7e8ea26a3bd7
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
6386f94938 -s ours am: 1a7dc2b1bb -s ours am: 2e7e8283cd -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/19094577 Change-Id: I812e45d6183b9b33a31f9d2743b9d2215144abcb 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
6386f94938 -s ours am: 1a7dc2b1bb -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/19094577 Change-Id: If1fc1cf8e816fcf697751877598ad9a5ac8c574f 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
6386f94938 -s ours am skip reason: Merged-In I77b937775fa774c700b9a080a92bbeb9d80f5d32 with SHA-1 b1f4d834c3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/19094577 Change-Id: If146f5d011b581b821bc185696c9c993407935f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32 Change-Id: Iccfc5d2289de2094e64450266598dfb2ea2242df
2022-06-22[automerger skipped] Merge "Remove bonito_car and sargo_car" am: 9faa311d44 ↵Treehugger Robot
-s ours am: ce049c9da9 -s ours am: 747a696126 -s ours am: a24dc34441 -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: I96917f47602823d71d96e1744bfcade59817ae86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Remove bonito_car and sargo_car am: b1f4d834c3 -s ours ↵Raman Tenneti
am: 6fd6349e7a -s ours am: 692eadb4d0 -s ours am: 0173e482a9 -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: Ia291055aed9e93ddc62448ee847ad2ca19ad5027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Merge "Remove bonito_car and sargo_car" am: 9faa311d44 ↵Treehugger Robot
-s ours am: ce049c9da9 -s ours am: 747a696126 -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: If7109cf296df990734765a0289d655279836bf77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Remove bonito_car and sargo_car am: b1f4d834c3 -s ours ↵Raman Tenneti
am: 6fd6349e7a -s ours am: 692eadb4d0 -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: Ib4bc881160b3f498d4aee562564ae070b9b81c69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Merge "Remove bonito_car and sargo_car" am: 9faa311d44 ↵Treehugger Robot
-s ours am: ce049c9da9 -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: I2abcaf881ebaff2af6935dfb221522300d7c0269 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Remove bonito_car and sargo_car am: b1f4d834c3 -s ours ↵Raman Tenneti
am: 6fd6349e7a -s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: I0f70a6a98671f538a3ee3af62269c33e61cda350 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Merge "Remove bonito_car and sargo_car" am: 9faa311d44 ↵Treehugger Robot
-s ours am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: I45f7a8c6ee2bd54ca30833a9b21975580a6f3225 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22[automerger skipped] Remove bonito_car and sargo_car am: b1f4d834c3 -s oursRaman Tenneti
am skip reason: Merged-In I96a8c37814cc8580f7a3a2965da352fb65310024 with SHA-1 81322bb396 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2134156 Change-Id: I5629cec9814d22c09024a5570e2f08957fad6671 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22Merge "Remove bonito_car and sargo_car"Treehugger Robot
2022-06-22Remove bonito_car and sargo_carRaman Tenneti
Bug: 231637772 Bug: 236413770 Test: presubmit Change-Id: I77b937775fa774c700b9a080a92bbeb9d80f5d32 Merged-In: I96a8c37814cc8580f7a3a2965da352fb65310024
2022-06-20Revert^6 "Remove bonito_car and sargo_car" am: 81322bb396 am: dc5b67baac am: ↵Raman Tenneti
a53f9c699e Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18974332 Change-Id: Ia4edeb53b3e590cac22268d35e4738a51ed9e492 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20Revert^6 "Remove bonito_car and sargo_car" am: 81322bb396 am: dc5b67baacRaman Tenneti
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18974332 Change-Id: Icf777d057d2853006f06985f6c6c2d0f1e6e44a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20Revert^6 "Remove bonito_car and sargo_car" am: 81322bb396Raman Tenneti
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18974332 Change-Id: I2d05565551aab49904190fb122472783231d7ade Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17Revert^6 "Remove bonito_car and sargo_car"Raman Tenneti
86bf9e91c3f4d53f4d1b97a2bf6e58b0127c8d21 https://android-build.googleplex.com/builds/abtd/run/L23000000955159339 is the run for build_test Bug: 231637772 Bug: 236413770 Change-Id: I96a8c37814cc8580f7a3a2965da352fb65310024 Merged-In: I96a8c37814cc8580f7a3a2965da352fb65310024
2022-06-17[automerger skipped] Merge Android 12 QPR 3 am: b4794088c3 -s ours am: ↵Xin Li
83f9e370a7 -s ours am: 19b360f3d4 -s ours am: c85588c3cb -s ours am skip reason: Merged-In I62aa3b5fcc60a34f211defd0b50df6bbce604580 with SHA-1 abf03d2427 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2126117 Change-Id: If8bee1f4619369ead9a7dabd184eebfcf8b6c9a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17[automerger skipped] Merge Android 12 QPR 3 am: b4794088c3 -s ours am: ↵Xin Li
83f9e370a7 -s ours am: 19b360f3d4 -s ours am skip reason: Merged-In I62aa3b5fcc60a34f211defd0b50df6bbce604580 with SHA-1 abf03d2427 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2126117 Change-Id: I173ec8c572669397c6f82e9fe04bfc66073e32d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17[automerger skipped] Merge Android 12 QPR 3 am: b4794088c3 -s ours am: ↵Xin Li
83f9e370a7 -s ours am skip reason: Merged-In I62aa3b5fcc60a34f211defd0b50df6bbce604580 with SHA-1 abf03d2427 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2126117 Change-Id: I8037e9de9a207235918e02ed9335ea6c1b44410e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16[automerger skipped] Merge Android 12 QPR 3 am: b4794088c3 -s oursXin Li
am skip reason: Merged-In I62aa3b5fcc60a34f211defd0b50df6bbce604580 with SHA-1 abf03d2427 is already in history Original change: https://android-review.googlesource.com/c/device/google_car/+/2126117 Change-Id: I64dccae4f6f0181866fcb3ab2490ec3e3df3225b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove bonito_car and sargo_car am: b890bcd839 am: e7175172a4 am: 201bbbd5b7Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: I77fb67bbc33475c2dc32806b974b6218c9435c60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Remove bonito_car and sargo_car am: b890bcd839 am: e7175172a4" into ↵Automerger Merge Worker
tm-d1-dev-plus-aosp am: 3d2f5336fa Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: I60c7e037d7f358a3385ad57ce0c2810a755e5e2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove bonito_car and sargo_car am: b890bcd839 am: dd8cfbfd43 am: bb12ed2cf8Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: I8a5f711059356b7b22eea38437f22d67f71ab484 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Remove bonito_car and sargo_car am: b890bcd839 am: e7175172a4" into ↵Automerger Merge Worker
tm-d1-dev-plus-aosp
2022-06-15Remove bonito_car and sargo_car am: b890bcd839 am: e7175172a4Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: Ice03dd870f6f929f2f6a9efa96ebfc36016451e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove bonito_car and sargo_car am: b890bcd839 am: dd8cfbfd43Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: Ia04bd20bf395364fd110efa52f060b41fc26528a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove bonito_car and sargo_car am: b890bcd839 am: e7175172a4Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: Ibd2d0649136d13e3e417e3c033fae686e0c39b5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove bonito_car and sargo_car am: b890bcd839Cyan_Hsieh
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/18770292 Change-Id: I78f69eae398ba769ac4c8401c9c373c899c26798 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-06-17 11:46:52 +0000