Commit graph

91042 commits

Author SHA1 Message Date
Lokesh Kumar Goel
423b88dd5d [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours am: 4bb2deae8b -s ours am: 89955802bc -s ours am: 11277e6a06 -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I33f259ff1fa252c9628c872203827615e217093c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:49:37 +00:00
Lokesh Kumar Goel
f9bb93f237 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours am: da9342ba92 -s ours am: 80dcb425d8 -s ours am: 64f2767e5d -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Ia3e719670e15a47e0378e342e21058897d6dce2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:48:07 +00:00
Lokesh Kumar Goel
23e7f6e2d1 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours am: 5b4e363b89 -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Ic9af4de2cfcc01ee4c20a662c317dfe5d674b9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:12:43 +00:00
Lokesh Kumar Goel
968aecd60d [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours am: c1f085c641 -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I2fdd563a1c1ce3a7dff3bf07376690db6a693406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:11:51 +00:00
Lokesh Kumar Goel
11277e6a06 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours am: 4bb2deae8b -s ours am: 89955802bc -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I2c01a18748483aa6bdb299c9d087d8e0135742db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:04:43 +00:00
Lokesh Kumar Goel
64f2767e5d [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours am: da9342ba92 -s ours am: 80dcb425d8 -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I2a034f59a6b740a9c50c4656f887cf6ca5a21a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:03:44 +00:00
Lokesh Kumar Goel
89955802bc [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours am: 4bb2deae8b -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Ib3363e896e0d6016018ec0d83c3aabc40bd428e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:36:56 +00:00
Lokesh Kumar Goel
80dcb425d8 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours am: da9342ba92 -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I0f372995024b22e943ff6878a1751cfc8985e7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:36:10 +00:00
Cole Faust
ecc016c8a7 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb am: b038d13fba
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I64bbb91e111575195505a2694cd088c2e5675e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:36:03 +00:00
Treehugger Robot
80e12316ce Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6 am: a865decd76 am: 959ed71cf2 am: 1739b30f34 am: f533a0c999
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: I171d2cca2c66ff11ea589d9fd26d4bc054e9f063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:35:47 +00:00
Lokesh Kumar Goel
5b4e363b89 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Iea76e828f647b15ad1a2a209653bb354677d4f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:53:12 +00:00
Lokesh Kumar Goel
c1f085c641 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I12caf377a265fe2c14beb69c1a2a19e4ef90fd1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:52:51 +00:00
Lokesh Kumar Goel
4bb2deae8b [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours am: 13ca7fb1bc -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I6e6a22bd717fc92a6e0f0bca775b182af5156f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:52:41 +00:00
Lokesh Kumar Goel
da9342ba92 [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours am: 155dba296b -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Ib460c3923c35633826ba00901d085fb4cac61874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:52:19 +00:00
Cole Faust
b038d13fba Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: Ic67f09632801bcced88587f63e520a75218c493a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:51:51 +00:00
Lokesh Kumar Goel
13ca7fb1bc [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d am: 428f6a0f8b -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I34e42f72b1b8ac251c1945a5b904e598b489b3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:50:47 +00:00
Treehugger Robot
f533a0c999 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6 am: a865decd76 am: 959ed71cf2 am: 1739b30f34
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: I04e3fbd29cee589835367078d44701387d6de4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:50:36 +00:00
Cole Faust
cf483e91fb Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: Ic8949f2ea588ebc5e956d578ed0a6559c9150a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:26:36 +00:00
Treehugger Robot
1739b30f34 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6 am: a865decd76 am: 959ed71cf2
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: Ia1f63688bdd3a55f52a6008576b8645e25ae04f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:26:21 +00:00
Cole Faust
b023d21043 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I042a54db2f74c465f6b3c82a384fa1719519dda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:21 +00:00
Lokesh Kumar Goel
155dba296b [automerger skipped] Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 05e112562d -s ours
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I712a1c2993fbbf4b4608a0dbb840e2e38c22c111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:10 +00:00
Treehugger Robot
959ed71cf2 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6 am: a865decd76
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: I5eee4d94c0559271d27683d167161189ccdb4230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:06 +00:00
Lokesh Kumar Goel
428f6a0f8b Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d am: 683f82977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048

Change-Id: Icab679a5e0bf1eb832d8d5207ae7f28a6798827b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:47:13 +00:00
Cole Faust
1b107d4b5f Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I6c0f11717ecf654b8060fb87aea35ee2ad4cf441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:15:24 +00:00
Treehugger Robot
a865decd76 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: Ic2ae64ee5c1ad43cfd2341d41f0d808063aec896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:14:51 +00:00
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +00:00
Lokesh Kumar Goel
683f82977d Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048

Change-Id: Ic024fe708d4bb66efb04413096bae0706feb4df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:34:25 +00:00
Lokesh Kumar Goel
05e112562d Update Security String to 2023-10-01 am: e257bf1863 am: e3e3c51f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048

Change-Id: I2a2b1b98bc88b8c9f64c243b3496aea231175c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:34:17 +00:00
Treehugger Robot
de9df1dcf6 Merge changes I2920d8b0,I55cd3340 into main
* changes:
  Add 16K ramdisk to vendor_boot
  Move 16K kernel modules to /lib/modules/`uname -r`_16k
2023-08-21 21:32:02 +00:00
Lokesh Kumar Goel
e3e3c51f6d Update Security String to 2023-10-01 am: e257bf1863
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048

Change-Id: I19517c6e9970b6c6f7dbbe7ecd41f6ca73639175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:33:43 +00:00
Treehugger Robot
982a265017 Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff am: a0bfc6a05e am: 1f73966b36 am: 9fc27b2e17 am: 3644153773
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: I0aac55d1f85c43bc16d00c1f0e0abbeb12182433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 19:24:42 +00:00
Cole Faust
f7554e3735 Ignore vndk compat symlinks in artifact path requirements
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07:00
Treehugger Robot
3644153773 Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff am: a0bfc6a05e am: 1f73966b36 am: 9fc27b2e17
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: I7c8f47bd69d21817b0fa5ee1e6bd761a0928867f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 18:42:46 +00:00
Treehugger Robot
9fc27b2e17 Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff am: a0bfc6a05e am: 1f73966b36
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: I34fd4b310cb9dc26fa7cb6eb4e21e6e63d89e508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 18:17:21 +00:00
Treehugger Robot
1f73966b36 Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff am: a0bfc6a05e
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: Iad2c9412e9ce10a51c83055873a9433a93adfa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 17:43:39 +00:00
Harshit Mahajan
2a453902a0 Merge "[CrashRecovery] Add module to BCP and SSCP" into main 2023-08-21 17:42:28 +00:00
Lokesh Kumar Goel
e257bf1863 Update Security String to 2023-10-01
Bug: 295937899
Change-Id: Iceeda64124c3152e9b31c0b6fa994fe77f90fa3b
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Merged-In: I0e2c4746c9042f7caf76cafa1db50f7c93cd211f
2023-08-21 17:25:13 +00:00
Treehugger Robot
a0bfc6a05e Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: Ibcacfc6230a0fdef46e4662c79faa4b2ee6adb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 17:09:13 +00:00
Eran Messeri
da5b527548 Merge "Remove the empty property of attestation." into main am: 66832f6525 am: e24afe8cfb am: cec42e3849 am: e90f0b7324 am: 5cb7eaf80b
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I1edf067006d2de5490f9c103b65522cce4c79737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 16:36:40 +00:00
Treehugger Robot
901fe0c618 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 am: 84b3f07b31 am: a2429cece4 am: 897ff17e3d am: 88a856eb02
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: I4bd02558cf4ebbb814841bc51183148617818d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 16:35:52 +00:00
Treehugger Robot
f7171f4dff Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main 2023-08-21 16:30:53 +00:00
Eran Messeri
5cb7eaf80b Merge "Remove the empty property of attestation." into main am: 66832f6525 am: e24afe8cfb am: cec42e3849 am: e90f0b7324
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I8273dcc9ff71df03a9efcb9e6af95e94d16e78e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 15:55:52 +00:00
Treehugger Robot
88a856eb02 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 am: 84b3f07b31 am: a2429cece4 am: 897ff17e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: Ib748fc0046bb19c127db37f670f2712398cad5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 15:55:35 +00:00
Eran Messeri
e90f0b7324 Merge "Remove the empty property of attestation." into main am: 66832f6525 am: e24afe8cfb am: cec42e3849
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I9e960c45eece56c1b6eb3e2bcd359732b6edb941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 15:31:39 +00:00
Treehugger Robot
897ff17e3d Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 am: 84b3f07b31 am: a2429cece4
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: If72866879ec4c4e6a082796e3d15c6d1ca2c7377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 15:31:21 +00:00
Eran Messeri
cec42e3849 Merge "Remove the empty property of attestation." into main am: 66832f6525 am: e24afe8cfb
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: Ib96bad858b7b545a688ad36afe4173e2882b3beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:57:57 +00:00
Treehugger Robot
a2429cece4 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 am: 84b3f07b31
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: If15ec203536e8636dca4830e8e3cae3a64be1386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:57:42 +00:00
Eran Messeri
e24afe8cfb Merge "Remove the empty property of attestation." into main am: 66832f6525
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I96218b2a21c805a6c193a2f5692100d5d5f2a3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:56:45 +00:00
Eran Messeri
66832f6525 Merge "Remove the empty property of attestation." into main 2023-08-21 14:34:49 +00:00
Treehugger Robot
84b3f07b31 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: Ide1a1cdad902fff2b3385b00f3c047251304dea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:23:11 +00:00