Treehugger Robot
|
469220d8e9
|
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d am: 8c90005ff0 am: 19ca755ba3 am: cdf1a82100 am: 8c390da2c2
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I93cf0830525c90e14b285e9c366bcda0eb49f931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 16:41:37 +00:00 |
|
Alix Espino
|
045525b3b2
|
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8 am: 4b1f38076d am: fda78d0287 am: 1ed186aa16
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: I346f91b0828ace2829f5a7d74bb5ad88cbe857bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 16:10:02 +00:00 |
|
Automerger Merge Worker
|
945d9d7ce1
|
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3 -s ours am: ae538dced1 -s ours am: 8540ce34dd -s ours am: d430311c94 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I1180cd3808944c2261b24d37791002e7a07120bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 16:01:42 +00:00 |
|
Xin Li
|
d07a58bfee
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 17296cdcf9 -s ours am: 754f97486f -s ours am: 857fcdcfcf -s ours am: 92f03489bf -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I34564fd477d08234b0338bdd574a21bbd59ca0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 16:01:16 +00:00 |
|
Xin Li
|
0f74c9940c
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 4ce7e8cc2b -s ours am: 57fd933c19 -s ours am: b1ea9fc913 -s ours am: 4682be6571 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: If62b625f9837e24dd1897a52f65afb1bf7e7ffa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 15:44:47 +00:00 |
|
Xin Li
|
7f03762263
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours am: fe66e04bd5 -s ours am: 3b70c87f5b -s ours am: c73d06f8bd -s ours am: ec23df1085 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I4f1dc226a8d285440ff3fbee2a2126676549f304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 15:44:18 +00:00 |
|
Alix Espino
|
1ed186aa16
|
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8 am: 4b1f38076d am: fda78d0287
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Id195688a0d23465d4d830804245b993ba65321c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 15:17:04 +00:00 |
|
Alix Espino
|
fda78d0287
|
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8 am: 4b1f38076d
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Ibab5402d8b11e6145091fbaa1757833061958586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:49:26 +00:00 |
|
Alix Espino
|
4b1f38076d
|
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Ib95ca998b32dbac61f2f7d3814dca22db716a279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:21:13 +00:00 |
|
Trevor Radcliffe
|
40c9bbb566
|
Merge "Add note to Changes.md about sysprop changes" am: 061479c528 am: 7b47295468 am: 8b352a5670 am: 7eb81dc1da am: cbe1282320
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: I189efbfe94804cdaf759412918282df26783962f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:46 +00:00 |
|
Steve Berbary
|
03c7cc3373
|
Update Security String to 2022-10-05 am: 763c03967e am: e01df6fce7 am: 04a96a4c49 am: e0c9c328b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: I4439dd71b065159d6293a53556f017dce45e343e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:36 +00:00 |
|
Steve Berbary
|
8f8a2e78f0
|
Update Security String to 2022-10-05 am: 763c03967e am: d4ef068ecb am: ed5f31ba5b am: 602eb53fb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: I303c25bddcf7df7934407d97695052bbe771bd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:29 +00:00 |
|
Steve Berbary
|
c928f4f354
|
Update Security String to 2022-10-05 am: 763c03967e am: d4ef068ecb am: dea0e19645 am: 7689460a68
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: Ib54289be28d72879b110f061842c2f9aaf0aa085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:22 +00:00 |
|
Bob Hanji
|
0aff2b6ab3
|
[automerger skipped] Merge "Add permission to the list of individually toggleable modules" into tm-qpr-dev am: 6eb82eb714 -s ours am: 7c315ed297 -s ours
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19605937
Change-Id: I69b7a790b56b291a153566f1a15491a3f924447a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:03 +00:00 |
|
Paul Duffin
|
f6682bd354
|
[automerger skipped] Add permission to the list of individually toggleable modules am: 68867443b5 -s ours am: 807a2d95c7 -s ours
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19605937
Change-Id: I2d5bf02358b9e15007c212691b3f8bc54f0e3351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:18:01 +00:00 |
|
Treehugger Robot
|
55494f1e8d
|
Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3 am: 81994f0b27 am: c26da4e2d5 am: 236488f3ad am: c6ee49b35d
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088
Change-Id: I3e661ea2334ddc6bf3eaa3fdc057a78916b51b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 14:17:49 +00:00 |
|
Alix Espino
|
065afd42e8
|
Merge "Updated Changes.md on deletion of clang property"
|
2022-08-17 13:42:28 +00:00 |
|
Yifan Hong
|
b8df917479
|
Merge "Support GKI with non-A/B recovery" am: e6f92d1411 am: f19cd6f89f am: 74d1aa231c am: a766297fed am: c6660a606d
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837
Change-Id: I5ef9680c290f7fbf00ebc30f3a47b3323dcabf96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 13:37:22 +00:00 |
|
Treehugger Robot
|
45cb03f3a0
|
Merge "Add mainline dev certificate dir to config" am: 22907b7777 am: 78ca053052 am: f3fa9ed0e9 am: 36074148eb am: fb79320b12
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338
Change-Id: Id72d4f791b327dbf900c3b6f910e1d27d279a36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 12:55:23 +00:00 |
|
hungweichen
|
f1f5dd3011
|
Remove VB related code
Cleaning up the related references of VB in Makefile
Bug: 241044073
Change-Id: I9e0ec9d433f2e76951c4390f716cf77674174930
|
2022-08-17 08:52:17 +00:00 |
|
Hung-Wei Chen
|
1a2b5f7b91
|
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783 am: f44646461d am: 653425238b
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: I4d64aeb78e79a10308759fc9a18d883806f7b31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 05:08:18 +00:00 |
|
Xin Li
|
b2a14afe9a
|
[automerger skipped] DO NOT MERGE - Skip TP1A.220624.021.A1 am: 5bd7543b98 am: 15f48d2e57 am: b34f9205d7 am: 1cbc7d435b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19610768
Change-Id: Ic95dfaeb4d9a11aee29c04066a4eb240ea9ce2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 04:48:18 +00:00 |
|
Hung-Wei Chen
|
653425238b
|
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783 am: f44646461d
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Ibf3d91061c5753c96fb1991a9516d025cdbfb847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 04:25:37 +00:00 |
|
Hung-Wei Chen
|
f44646461d
|
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Id90490fac6fcd6476f4e9d6d244ed40eb89a44c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 04:04:28 +00:00 |
|
Hung-Wei Chen
|
cb7c04f783
|
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Ibb11fab6513c726a03e6053f70caac0ddc3b6404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 03:42:07 +00:00 |
|
Hung-Wei Chen
|
a7dfb456a1
|
Merge changes Ifbcde7da,Icee659ff,I267da2d5
* changes:
Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
|
2022-08-17 03:09:20 +00:00 |
|
Treehugger Robot
|
8c390da2c2
|
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d am: 8c90005ff0 am: 19ca755ba3 am: cdf1a82100
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I049597cb0ccefb14e540c99ebcb6f59aac5f0f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 02:04:52 +00:00 |
|
Treehugger Robot
|
cdf1a82100
|
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d am: 8c90005ff0 am: 19ca755ba3
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I143b236a22eeb5846658df9116a1829216e07921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 01:36:02 +00:00 |
|
Treehugger Robot
|
19ca755ba3
|
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d am: 8c90005ff0
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: Icc3c7290110fadf0cbc6a6ed9850dfb7130b975d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 01:13:31 +00:00 |
|
Automerger Merge Worker
|
d430311c94
|
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3 -s ours am: ae538dced1 -s ours am: 8540ce34dd -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ib5d20796b7c2525f4cfb7820fc2031361a385c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 01:10:00 +00:00 |
|
Xin Li
|
92f03489bf
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 17296cdcf9 -s ours am: 754f97486f -s ours am: 857fcdcfcf -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I45972314a5b4a06ebac7c72ec8d97e1717311a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 01:09:33 +00:00 |
|
Automerger Merge Worker
|
8540ce34dd
|
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3 -s ours am: ae538dced1 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I8f9174bfc76a1b1cd1e75c20fbf1fc28483e27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:55:34 +00:00 |
|
Xin Li
|
857fcdcfcf
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 17296cdcf9 -s ours am: 754f97486f -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I53145bf821d2b6e0f78bb3f2163aacd1ef6fe15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:55:05 +00:00 |
|
Xin Li
|
4682be6571
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 4ce7e8cc2b -s ours am: 57fd933c19 -s ours am: b1ea9fc913 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Id5ab18eff24d7d1e42183f5716202d19ef74780f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:50:29 +00:00 |
|
Xin Li
|
ec23df1085
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours am: fe66e04bd5 -s ours am: 3b70c87f5b -s ours am: c73d06f8bd -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: If76b3e8da080338c1ab55a8062a18db72be81568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:50:03 +00:00 |
|
Treehugger Robot
|
8c90005ff0
|
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I46af002f47f8a638cc3e31601de2a922ab2a212d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:49:11 +00:00 |
|
Trevor Radcliffe
|
cbe1282320
|
Merge "Add note to Changes.md about sysprop changes" am: 061479c528 am: 7b47295468 am: 8b352a5670 am: 7eb81dc1da
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: I71d40e1e51e6dc7766b9a1ac079a7d6b4af685ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:37:09 +00:00 |
|
Automerger Merge Worker
|
ae538dced1
|
Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I31a05593fb59ea47272206bfaeb636da975871e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:29:56 +00:00 |
|
Xin Li
|
754f97486f
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 17296cdcf9 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I9b7286158e85fc39645a72a5a17ec450415e6d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:29:29 +00:00 |
|
Xin Li
|
b1ea9fc913
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 4ce7e8cc2b -s ours am: 57fd933c19 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I95a653f0ceea6d4255a1020e6e87977685c2661f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:26:21 +00:00 |
|
Xin Li
|
c73d06f8bd
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours am: fe66e04bd5 -s ours am: 3b70c87f5b -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ifba265555f866347b01bfbb91edd48dd9d329de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:25:50 +00:00 |
|
Treehugger Robot
|
2dca04c64d
|
Merge "Suppress R8 warnings for support library annotations"
|
2022-08-17 00:07:51 +00:00 |
|
Xin Li
|
57fd933c19
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours am: 4ce7e8cc2b -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I94f76a21a60c87bd9775a05e0421b0c4b43a3ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-17 00:00:16 +00:00 |
|
Xin Li
|
3b70c87f5b
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours am: fe66e04bd5 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ib75c85ac390903232e2148aed9408b504e6dfcb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:59:48 +00:00 |
|
Trevor Radcliffe
|
7eb81dc1da
|
Merge "Add note to Changes.md about sysprop changes" am: 061479c528 am: 7b47295468 am: 8b352a5670
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: Ibb3f63312e2378cab1c2b1e73f34e7bddef84d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:58:45 +00:00 |
|
Automerger Merge Worker
|
4cb470ffd3
|
Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master
* changes:
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours
|
2022-08-16 23:43:03 +00:00 |
|
Xin Li
|
17296cdcf9
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I29a77bd44d43658a4eaaa1fb2f34146d3541c29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:40:11 +00:00 |
|
Xin Li
|
b083f6aac0
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I5df27d30d7bedada9707b11a1514872e5f320ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:39:44 +00:00 |
|
Xin Li
|
4ce7e8cc2b
|
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: If424953ab758e45ae82863842a9746fb0036a494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:37:48 +00:00 |
|
Xin Li
|
fe66e04bd5
|
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ib2048aa84fc3dc4509cd5ae0c67aa956773040b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-16 23:37:18 +00:00 |
|