StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,050 Commits 1 Branch 0 Tags
b83c3c55ff55fa8539bc3d0cdfc255d94296da9c
Commit Graph

89050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
c897327bed [automerger skipped] Dist kernel_version.txt am: e0d8de9068 am: 1e6d3f7e73 -s ours am: 56cdf27135 -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 27f36d1bc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: I794bf27d14e47b41f1d572b19edb934af67e875c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:26:45 +00:00
Neha Jain
9926178660 Revert "Enable CFI for the whole Bluetooth repo and not just system" 
This reverts commit d759b3517a.

Reason for revert: b/289779264

Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
 2023-07-12 23:16:25 +00:00
Colin Cross
63d855a8cf [automerger skipped] Dist kernel_version.txt am: e0d8de9068 -s ours am: c442d9f682 -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 27f36d1bc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: I7d35c7b4f6bcfdd2b32ac22500be4ea8c25b5458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 22:41:41 +00:00
Colin Cross
27d1e4934f Dist kernel_version.txt am: e0d8de9068 am: 1e6d3f7e73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: I867592e05ac4e5a9cec8a6a2b30850fbc64d55fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 22:40:20 +00:00
Colin Cross
56cdf27135 [automerger skipped] Dist kernel_version.txt am: e0d8de9068 am: 1e6d3f7e73 -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 27f36d1bc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: Ib605711564a250674d47cec1ee90109028b7abbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 22:37:47 +00:00
Tiffany Yang
47da6d4592 Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 am: 13ba580f9f am: 20dbd142b6 am: 8dcb5a09e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: I9017b42b1cf0ce59136f8bd5311c69fa455f63e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:55:48 +00:00
Treehugger Robot
af82a19525 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 am: 11eef9ca28 am: 1c2c2be13e am: 676db002b7 am: fc18e79d38 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: I988bced7ad5d8f7adead7035b5485349f82919f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:54:06 +00:00
Colin Cross
c442d9f682 [automerger skipped] Dist kernel_version.txt am: e0d8de9068 -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 27f36d1bc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: I132433a625848a210603a2e0ad102c12435b3ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:53:07 +00:00
Colin Cross
1e6d3f7e73 Dist kernel_version.txt am: e0d8de9068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24042245

Change-Id: Ib6b7e6d76a9bfb2eeafa1951ad98fa6c4cd5242e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:52:45 +00:00
Tiffany Yang
8dcb5a09e1 Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 am: 13ba580f9f am: 20dbd142b6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Iaa937fdacf18f3918dee7419c6cbf68d91f9a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:08:55 +00:00
Treehugger Robot
fc18e79d38 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 am: 11eef9ca28 am: 1c2c2be13e am: 676db002b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: I673ef6dfd6e0d611d1b9477ae5704f2969cc5e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 21:08:36 +00:00
Tiffany Yang
20dbd142b6 Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 am: 13ba580f9f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: I5014024fae5b0c896aa0898d2c71faea453677e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 20:23:18 +00:00
Treehugger Robot
676db002b7 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 am: 11eef9ca28 am: 1c2c2be13e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: I4859487a3b24b6ded4e2d66d02fd2f185f8b7e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 20:19:43 +00:00
Tiffany Yang
13ba580f9f Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Ife1860b73bc83d32a61817d5a9fe25c2deb1e37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:40:41 +00:00
Treehugger Robot
1c2c2be13e Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 am: 11eef9ca28 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: Idfbe6480498dcceaaf4649bb5b4dc746d01d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:40:29 +00:00
Austin Borger
b624cb9412 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 922923b5f2 -s ours am: 74e5241094 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I8b5eef8ee2fee68fd5091a56c09dbb741680b7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:30:13 +00:00
Spandan Das
5d31fb978e [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 13efbf2e27 -s ours am: e3c05c11e9 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I6e95202b712ca8485c899cbd283c4e9dbd34603b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:29:24 +00:00
Treehugger Robot
e8e43f5421 Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a am: e726af3cab am: 59349a5ad3 am: ca22f20fc1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I857efa93bfc610a25896c862e03e30e852a56cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:13:27 +00:00
Automerger Merge Worker
3983c27e9e Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 77131bc28d -s ours am: 6ab3c51009 -s ours
  [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 94cbe2fbfd -s ours am: 8bdc7e51b4 -s ours
 2023-07-12 19:05:42 +00:00
Austin Borger
4776f1282c [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 77131bc28d -s ours am: 6ab3c51009 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I0f20961cda3db94166e4491ae04f18c7ebcbd849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:03:07 +00:00
Spandan Das
a552e04fb3 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 94cbe2fbfd -s ours am: 8bdc7e51b4 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I3dc5560d6a5350200ffe8e9b5c20b2c4dd0810db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:02:17 +00:00
Austin Borger
697488b347 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 922923b5f2 -s ours am: 3087cfa7e3 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I4f5d33d00a5b892ae4f3c67f90255b0797a08b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:00:37 +00:00
Spandan Das
22c88c8508 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 13efbf2e27 -s ours am: ba31418630 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I7b4051691098b620ae3ad2aca648a8c233fcf2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:59:50 +00:00
Tiffany Yang
e728051f12 Merge "Make common signature system property definitions optional" into main am: b8306086d3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Ieb8b84d340f2308255ad2f23e5ac23635fb680de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:50:28 +00:00
Treehugger Robot
11eef9ca28 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: I23957bf5bfe70e8a89e574063a32dba851fc9c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:50:14 +00:00
Austin Borger
74e5241094 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 922923b5f2 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: Icacf3309d7e757f8801b81e08a626029a23302ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:46:59 +00:00
Spandan Das
e3c05c11e9 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 13efbf2e27 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I6f63d5c8abfd9e3b6c0f4b1f6d8687be6bc2318f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:46:10 +00:00
Wei Li
fa2d551da5 Revert "Revert "Support SBOM generation of m build unbundled APEXs."" 
This reverts commit bab162156e.

Bug: 266726655
Reason for revert: issue is fixed in ag/23851209.
(cherry picked from https://android-review.googlesource.com/q/commit:50745668c3a976a4c365f02e845b014e6afc4d38)
Merged-In: I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9
Change-Id: I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9
 2023-07-12 18:39:56 +00:00
Treehugger Robot
ca22f20fc1 Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a am: e726af3cab am: 59349a5ad3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I9f97668f5f94ca3ef26d9965f53f545c1c682a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:38:35 +00:00
Tiffany Yang
b8306086d3 Merge "Make common signature system property definitions optional" into main 2023-07-12 18:35:37 +00:00
Austin Borger
6ab3c51009 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 77131bc28d -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: Iffc0c8088b39b57460483822988d31dfaf570ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:34:53 +00:00
Spandan Das
8bdc7e51b4 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 94cbe2fbfd -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I96574cc48a3cd341c2cb9d543282cc24f4f692e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:34:08 +00:00
Bill Yi
b76d8984a1 [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c -s ours am: 034689bc97 -s ours am: fdcdbed706 -s ours am: a502f7484c -s ours am: c6386df48d -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: Ifd24b67b2d4acf5aeffc8999339167105f974bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:29:09 +00:00
Bill Yi
ffaf2cf57e [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6 -s ours am: d7e8603916 -s ours am: 8aa6265e69 -s ours am: dd2effb0b9 -s ours am: 8ae60c9850 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: I504ebf26372e5f27598d9169bccaaae7b294f02b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:28:52 +00:00
Austin Borger
3087cfa7e3 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours am: 922923b5f2 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I17644dac22a51d0da1eb6e206ac19f2771ad46f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:27:26 +00:00
Spandan Das
ba31418630 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours am: 13efbf2e27 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: Icfe0e825f8a4d767776c11ec8ec952703935ed64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:26:33 +00:00
Treehugger Robot
59349a5ad3 Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a am: e726af3cab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: Id6a6efe50dfb7436fc4ed4bee46b386b01f5afa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:26:13 +00:00
Colin Cross
e0d8de9068 Dist kernel_version.txt 
Fixes: 290361803
Test: treehugger
(cherry picked from https://android-review.googlesource.com/q/commit:27f36d1bc80a4092f157845f86faf02d36517c18)
Merged-In: I146817c9cf256f086404c880a0215cb8e688c544
Change-Id: I146817c9cf256f086404c880a0215cb8e688c544
 2023-07-12 18:19:56 +00:00
Treehugger Robot
51ec7172a8 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main 2023-07-12 18:03:51 +00:00
Austin Borger
922923b5f2 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: If20e2ebd6c218aa4f3359f04d8ec583d266a0104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:51:55 +00:00
Austin Borger
77131bc28d [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours am: 196f43d427 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I0220b30008883c3c7640f5452154744a7a6ecf83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:50:41 +00:00
Spandan Das
13efbf2e27 [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I6c3b1d850475d7df21d864dd86e7e9d818e7cba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:50:24 +00:00
Spandan Das
94cbe2fbfd [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008 -s ours am: 6b8ac9a33a -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I74826d8faa8e5e0ae67bf0931ca6d9d9bbcc6eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:49:50 +00:00
Treehugger Robot
e726af3cab Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I53a6846f51e47e4fb30232a1b07674249b443de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:50 +00:00
Bill Yi
c6386df48d [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c -s ours am: 034689bc97 -s ours am: fdcdbed706 -s ours am: a502f7484c -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: I7ceba91c1254511541374640d19c3d0c58689e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:23 +00:00
Bill Yi
8ae60c9850 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6 -s ours am: d7e8603916 -s ours am: 8aa6265e69 -s ours am: dd2effb0b9 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: If8390edaa554f732f03d85fcacd0f9c0da7153e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:07 +00:00
Bill Yi
a502f7484c [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c -s ours am: 034689bc97 -s ours am: fdcdbed706 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: Idd04bc92e6a8cca3724c7b7a68fce1ac84e21611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:21:42 +00:00
Treehugger Robot
b0cb7ed80a Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I6048c660df0de9e71bf24a28bc64b1e596166345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:21:23 +00:00
Bill Yi
dd2effb0b9 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6 -s ours am: d7e8603916 -s ours am: 8aa6265e69 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: Id9b8a1f33ea345a542e9bf3e7a05efced9afe46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:21:21 +00:00
Austin Borger
196f43d427 [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64 -s ours 
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718

Change-Id: I82b8d12185b8e9abb733e8f35a1a96022f410f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:09:03 +00:00