Commit Graph

91771 Commits

Author SHA1 Message Date
rassb@google.com
97692744cb [automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e -s ours am: 6048b030db -s ours am: 557e096d78 -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: Ieb2c8813d6f436f34721c68c4b9cadc6d388bb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:05:46 +00:00
Roman Yepishev
b5330c414a [automerger skipped] Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74 am: f207276dd6 -s ours am: c54f0bedd9 -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: Ifbc8b0b090b22f977b49a774b6a026e36ebfd7ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:05:01 +00:00
rassb@google.com
4236b9ac0d [automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e am: eb0d1e330f -s ours am: 47f6d9f1d2 -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: I69d1859185e6411b527d047c48f0bd8e979e00e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:04:57 +00:00
Treehugger Robot
b3bb0fd346 Merge "aconfig: separate package name and flag name using dot" into main am: 2ee29fdf7f am: fb80ce539e am: 3bc2798a34
Original change: https://android-review.googlesource.com/c/platform/build/+/2760466

Change-Id: I85d5106b281bd0705b0ce9a28710de891b9de3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:24:59 +00:00
Treehugger Robot
3bc2798a34 Merge "aconfig: separate package name and flag name using dot" into main am: 2ee29fdf7f am: fb80ce539e
Original change: https://android-review.googlesource.com/c/platform/build/+/2760466

Change-Id: I4ea92a9765ca130f9ece124169e0fa99ad134732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:24:35 +00:00
Roman Yepishev
70ac53d053 [automerger skipped] Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74 -s ours am: 64b88c846d -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: I9f97e274a32a543124bdd8ab398dd9ebcc9f8d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:24:29 +00:00
rassb@google.com
557e096d78 [automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e -s ours am: 6048b030db -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: Iec5aaf950e205aad0f5f150a067725e716a8319a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:24:25 +00:00
Roman Yepishev
c54f0bedd9 [automerger skipped] Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74 am: f207276dd6 -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: I3276ca22eec4eac5c6ebadcb70e51e4f5a992418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:22:24 +00:00
rassb@google.com
47f6d9f1d2 [automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e am: eb0d1e330f -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: I541e7fe6716efede57521b372b6d32929dddd1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:22:19 +00:00
Roman Yepishev
15bf725da1 Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74 am: f207276dd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359

Change-Id: I91d920c3236b836108b9c01d2acf142a01cee4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:14:38 +00:00
rassb@google.com
7d11333ff4 DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e am: eb0d1e330f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359

Change-Id: Icc5cd35a519d692ca89474dde221e061d3f5ecd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 16:14:35 +00:00
Treehugger Robot
fb80ce539e Merge "aconfig: separate package name and flag name using dot" into main am: 2ee29fdf7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2760466

Change-Id: If2bba1ed1cb056ec4f60067a6ba48a1688db3f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 15:26:01 +00:00
Roman Yepishev
f207276dd6 Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359

Change-Id: If19c1a61e1ec1146c13f12be5e4bb839c0e34b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 15:23:33 +00:00
rassb@google.com
eb0d1e330f DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359

Change-Id: I315b6de050d890159f4c8a3d1984024ec6b8f0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 15:23:29 +00:00
Roman Yepishev
64b88c846d [automerger skipped] Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74 -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: I5c27b9bb855c1d281515d790cc5543b3dd0075ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 15:19:22 +00:00
rassb@google.com
6048b030db [automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb7e -s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9 is already in history

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

Change-Id: Ia28ecd7b2470991b1644a644b2a70571d80cfe46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 15:19:19 +00:00
Treehugger Robot
2ee29fdf7f Merge "aconfig: separate package name and flag name using dot" into main 2023-09-22 14:59:21 +00:00
Roman Yepishev
fb48efce74 Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev 2023-09-22 14:13:30 +00:00
Prashant Patil
1f64797c46 [automerger skipped] Merge "Remove the empty property of attestation." into udc-qpr-dev am: 0e9abb0348 -s ours
am skip reason: Merged-In Icaf1bcd089767b2c47d0b57064aa72a4c9483bb5 with SHA-1 99fafaec22 is already in history

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

Change-Id: Ia8326d461caf0133bdb69d6556779990340bf7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 13:39:26 +00:00
wufei3
75f3aaebe4 [automerger skipped] Remove the empty property of attestation. am: daa9b128f3 -s ours
am skip reason: Merged-In Icaf1bcd089767b2c47d0b57064aa72a4c9483bb5 with SHA-1 99fafaec22 is already in history

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

Change-Id: I99176b17bdddcf9b3133d5ecccf95e1cecadd4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 13:39:21 +00:00
Mark White
ca047da45c Added new framework-pdf jar inside MediaProvider module
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Id9f5ae58d57c77fdaf4babee58430e75656e923f
2023-09-22 13:33:05 +00:00
Prashant Patil
0e9abb0348 Merge "Remove the empty property of attestation." into udc-qpr-dev 2023-09-22 12:54:35 +00:00
Mårten Kongstad
7fa3cb176c aconfig: separate package name and flag name using dot
Change the package name and flag name separator in the text dump output
from a slash to a dot. This makes the output consistent with how the
flags are encoded in the API tracking files.

Bug: 283910447
Test: atest aconfig.test
Change-Id: Ie3e109073e7f04cf01568e16c29bf2872d07ebad
2023-09-22 13:52:40 +02:00
Mårten Kongstad
433fab94c8 printflags: introduce device tool to print feature flags
Metadata about all feature flags used on device are located in
/<partition>/etc/aconfig_flags.pb. Add a new tool, printflags, to read
and pretty-print these files.

printflags is only intended for debugging purposes.

Bug: 301547297
Test: adb shell printflags
Change-Id: I0a3277fecfc8a60eea0aa6bf362a25a311360b71
2023-09-22 13:47:49 +02:00
Kiyoung Kim
8908792eba Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: I606465eb0605677407e6394276dbc4656e12860b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 05:20:46 +00:00
Kiyoung Kim
798c03e59b Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Ib6ac5300336a9c0a3be1b3b50fb15d9bd0436c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 04:39:16 +00:00
Kiyoung Kim
c85717900d Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: I925f784a78aafe450d6fd11733b053c0fc950cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 03:46:23 +00:00
Kiyoung Kim
4345d8fd20 Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Id0236f9d3f936532f9cf6d71f2630b85cd0450e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:49:35 +00:00
Kiyoung Kim
a8c405f264 Merge "Define llndk modules instead of vndk_package" into main 2023-09-22 02:15:35 +00:00
Roman Yepishev
3cb7c5cfd2 DO NOT MERGE Designate udc-dev-*-plus-aosp as UDC am: fe63f28bd9 am: b5f9c7e806
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24825586

Change-Id: I78ec9ad930b06c11e537a6406ef593cd8d8b12e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:06:45 +00:00
Tomislav Novak
1af7e1fa7f emulator_arm64: Revert TARGET_NO_KERNEL to emulator default
With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on
$PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup
in emulator_arm64/device.mk").

$ lunch sdk_phone_arm64-eng && m
[...]
FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by
  'out/target/product/emulator_arm64/boot.img', missing and no known
  rule to make it

Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that
the emulator then uses, so no need to generate the boot image.

Test: lunch sdk_phone_arm64-eng && m
Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5
2023-09-21 14:49:56 -07:00
Roman Yepishev
b5f9c7e806 DO NOT MERGE Designate udc-dev-*-plus-aosp as UDC am: fe63f28bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24825586

Change-Id: Id9453a127c138b1e7dcd93af12c501d4b7d7d916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 21:27:43 +00:00
rassb@google.com
21b113cb7e DO NOT MERGE Designate udc-dev* branches as UDC.
Ignore-AOSP-First: The UDC designation only applies to udc-* branches.

BUG=297873435

Change-Id: I6efcbbc2ce714f7686806b735525a49531f8b24c
Merged-In: If49ce93abe63ad4e624a00454fcb3aa712f2d976
2023-09-21 15:54:27 +00:00
Roman Yepishev
fe63f28bd9 DO NOT MERGE Designate udc-dev-*-plus-aosp as UDC
Ignore-AOSP-First: The UDC designation only applies to udc-* branches.

Bug: 297873435
Change-Id: If49ce93abe63ad4e624a00454fcb3aa712f2d976
2023-09-21 15:52:16 +00:00
Ankur Bakshi
a403c91511 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: c8c1158110 -s ours am: 68591951c4 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Ia59fcee02fba3e863315229e65b97a2df9112c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:13:01 +00:00
Ankur Bakshi
9720b4442e [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 4a79945f76 -s ours am: d1fa0a1e1a -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I7d31bb7695a8eb05279bde68f9aefeb95a762027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:10:40 +00:00
Ankur Bakshi
390dfc94f0 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: e8c4e352fe -s ours am: 6459b397bd -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Ibe04cd6b34f3b42c119981fc29a18c088196523b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:03:36 +00:00
Ankur Bakshi
0afe6be445 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 215ddc2109 -s ours am: 9c42f5f534 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I0c8ad3c5012dee2e2ac7e96d905435416529852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:03:13 +00:00
Ankur Bakshi
7d9b017abd [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: c8c1158110 -s ours am: ac64c2bf25 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I324994d10608c68ad52dc476b41f19ba954a9d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:02:48 +00:00
Ankur Bakshi
854477ba65 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 4a79945f76 -s ours am: 5e15f9e0ea -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Ie9a6237ea8092f68d9bdc9f15c37fb982a6d69a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 14:02:08 +00:00
Ankur Bakshi
6459b397bd [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: e8c4e352fe -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I4f87498eefe2f1f543c2fd17eace6f755e7214b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:21:20 +00:00
Ankur Bakshi
9c42f5f534 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 215ddc2109 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I87fd6abedb1fd7bfff8432601f83c039b1bc572d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:20:43 +00:00
Ankur Bakshi
ac64c2bf25 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: c8c1158110 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I8320890d1fcc9bc89c812e200e37283c2d6b134a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:19:03 +00:00
Ankur Bakshi
5e15f9e0ea [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 4a79945f76 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I008ffdafcead4164720446878cac851602f62903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:18:48 +00:00
Ankur Bakshi
68591951c4 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours am: c8c1158110 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Ib6a54a03ad392f89b0497da66aedd54d26bcedc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:11:06 +00:00
Ankur Bakshi
d1fa0a1e1a [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours am: 4a79945f76 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Iea3bd4217fadf0388f89d2e842e72930b260e12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 13:10:56 +00:00
Ankur Bakshi
c8c1158110 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: Iccb968ac96bb8232114a89604d0c83a6d87c4234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 12:20:28 +00:00
Ankur Bakshi
4a79945f76 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I28de4f6e5c58d208bbac72f3adfb9d0ed88097a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 12:20:20 +00:00
Ankur Bakshi
e8c4e352fe [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: edf0d0fd43 -s ours am: 9247162446 -s ours am: a35fd83f94 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I7df112517732a3edb61705e4dd32c1b84ce9a909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 12:16:46 +00:00
Ankur Bakshi
215ddc2109 [automerger skipped] Update Security String to 2023-11-01 am: 17c3a6f62c am: b80ca22f4d am: b35a46376d am: 2e86d930ab -s ours am: fe1ee3b85f -s ours am: 08be70613e -s ours am: cc0baee8bf -s ours am: d041398918 -s ours
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I0ac78c28eeaf3f5f4d7c9ad7b85c8f9fe382cfcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 12:16:37 +00:00