tree 5664a17fe7fd0278adb81835a31c6209e7811b7e
parent e8c42848e91677d8655718ac6f1624ff03cabd8f
parent a7b23053cd421ce94900fc6730890ce288f01b51
author Anivia Li <aniviali@google.com> 1692908587 +0000
committer Anivia Li <aniviali@google.com> 1692911648 +0000

[cobalt]Merge changes from  branch 'upstream/1.6'

Commands:
git clone https://fuchsia.googlesource.com/third_party/tink
cd tink
git checkout upstream/1.6
git checkout origin/main -b ${USER}-merge
git merge upstream/1.6
./tools/convert_for_cobalt
git commit --no-verify

fx format-code --files=${gn build files that convert_for_cobalt wrote}

Bug:b/286923532

Change-Id: I008078b367d22bae712ee6a6ebee998011690ec5