refs/heads/android12-mainline-networkstack-release - platform/system/ca-certificates

commit: 6406003f1eb351e367f8ef8c5e240114fc3a314f
[log]
author: Xin Li <delphij@google.com>
Sat Feb 20 14:07:51 2021 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sat Feb 20 14:07:51 2021 +0000
tree: 4cae0e9143eebac20950458b1d6b4446b454c4f6
parent: e831cb162308ec729de35ac23403c3d3b74b6cb3 [diff]
parent: 2386ba30b061b559a5d67e4ecffac7d75e8066f9 [diff]

[automerger skipped] Mark ab/7061308 as merged in stage. am: a5752ef5fd -s ours am: 4eff58cb00 -s ours am: 2386ba30b0 -s ours

am skip reason: Change-Id I1c736b418b20bfa2a0905aa6616dcfeac9537247 with SHA-1 5226fe9330 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f14cdff1dc1e97b7916dd236ba79bbb9e4bc744

tree: 4cae0e9143eebac20950458b1d6b4446b454c4f6

files/
google/
soong/
wfa_certs/
Android.bp
METADATA
OWNERS
README.cacerts