summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-08Merge "Upgrade zlib to f4f46747bd5c68320126fea54d6993ae0b5c3edd" am: ↵Haibo Huang
32db2895d2 am: 763b7acb29 am: 5d4753f893 Change-Id: I84c1918dcc1cd744d79baa472ded38622e141cdf
2019-11-08Merge "Upgrade zlib to f4f46747bd5c68320126fea54d6993ae0b5c3edd" am: 32db2895d2Haibo Huang
am: 763b7acb29 Change-Id: I92425781c685da0938852e750b74c30e8daacca8
2019-11-08Merge "Upgrade zlib to f4f46747bd5c68320126fea54d6993ae0b5c3edd"Haibo Huang
am: 32db2895d2 Change-Id: I8635603330aa57bfcd9162ec71d73a68e4f1443e
2019-11-09Merge "Upgrade zlib to f4f46747bd5c68320126fea54d6993ae0b5c3edd"Treehugger Robot
2019-11-09Upgrade zlib to f4f46747bd5c68320126fea54d6993ae0b5c3eddHaibo Huang
Exempt-From-Owner-Approval: library upgrade Test: None Change-Id: Ie4501e6b2264371ff558e29a4cd6171284ef6cc6
2019-11-08Adding support for remaining deflate wrappers (zlib | raw) toSam Maier
compression_utils_portable This allows client code to select the wrapper format used which may be faster (e.g. zlib format on older ARMv7 and early ARMv8 SoCs) depending on the application. The wrapper format selection code was partially taken from zlib_bench.cc. Bug: 833361 Change-Id: I8a317e6abc8bd2d66f2e940406badfd7e930e809 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904505 Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#713870} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 8549d411737d978d478f1c4aa13ded47721dbcc9
2019-11-04Adding const to GetUncompressedSizeSam Maier
Change-Id: Ib538c60f5e1fa2e81432bc0992a482aced6eb7cb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897847 Auto-Submit: Sam Maier <smaier@chromium.org> Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Sam Maier <smaier@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#712161} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 60b63e2425bcb12ffd47527af414bd1ad8e7e631
2019-10-31Snap for 5978242 from c93dfc3d2b3e67f1a680011c9d7f645f970f0cd2 to rvc-releaseandroid-build-team Robot
Change-Id: Ic6c99abe552801b2ee4a5ff2a39ba30654f99a49
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 09c4c8426a am: ba3a1df798 -s ours am skip reason: subject contains skip directive Change-Id: Ic614b9f5a3da7f496557db80b6ebdd737a7bd588
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 09c4c8426a Change-Id: I4b039a1dad3b050b17cc38811bf9a784eb746e37
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I4be4be1ea2783d08aae40b47104dfa47d9af2546
2019-10-24Adding uncompressed size functionAdenilson Cavalcanti
Missing functionality to be able to reuse portable helpers. Change-Id: If38e5f2b44cff9fb5f1744a59961ee6902f847f2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876760 Reviewed-by: Sam Maier <smaier@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#709081} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 15d575f97d2de48ad0458732faf11f1a281c94fe
2019-10-17Snap for 5945950 from 1f999deb88807ed2daf7248923128199c2e4a462 to rvc-releaseandroid-build-team Robot
Change-Id: I07e4a2e620c043702ac1a2f722aeb1e52b80fe64
2019-10-16Merge "Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91" am: ↵Haibo Huang
de51e42c11 am: 046b1c12db am: b708c0f136 am: f3b6ef0554 Change-Id: I618405970adcf3a5bc275cb8f3dde1f75fbf933f
2019-10-16Merge "Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91" am: ↵Haibo Huang
de51e42c11 am: 046b1c12db am: b708c0f136 Change-Id: I5889c66bc8ecb86bf45ea3faa7bb2d9367c7c3f4
2019-10-16Merge "Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91" am: de51e42c11Haibo Huang
am: 046b1c12db Change-Id: I74f1b40a6963910577648e65f102db8144541b92
2019-10-16Merge "Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91"Haibo Huang
am: de51e42c11 Change-Id: I10da975666d7fd7cda89671a9782d9f084ead8b5
2019-10-16Merge "Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91"Treehugger Robot
2019-10-16Upgrade zlib to ddebad26cfadeb4ecdfe3da8beb396a85cf90c91Haibo Huang
Exempt-From-Owner-Approval: upgrade library Test: None Change-Id: Ic1fe3fb085f0adc747b2bc662f5bd5e22148ac61
2019-10-15GCC: Fix zlib symbol visibility macroJüri Valdmann
GCC parses the function __attribute__ syntax a bit differently from Clang, associating the attribute with the return type instead of the function if the return type is a pointer. This leads to certain zlib symbols, such as Cr_z_zError, to fail to be properly exported from the shared library. Fix by using ZEXTERN instead of ZEXPORT for the attribute which works the same for both GCC and Clang. Bug: 819294 Change-Id: I5707d1b0627a503df08df9ac0bb65fda69453989 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1859788 Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#705917} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 9c3aed099b010a75594a0efd523774c4c9a5e3d2
2019-10-01Convert third_party/zlib/google away from base::Bind/base::CallbackSylvain Defresne
base::Bind/base::Callback are deprecated in favor of either base::BindOnce/base::OnceCallback or base::BindRepeating/ base::RepeatingCallback (depending on whether the callback is invoked once or multiple time). Convert all uses of base::Bind/base::Callback in third_party/zlib/google to the recommended methods/types. Bug: 1007842 Change-Id: I45efc78b9138def0469912e5d733dbaeaa652407 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832270 Auto-Submit: Sylvain Defresne <sdefresne@chromium.org> Commit-Queue: Satoru Takabayashi <satorux@chromium.org> Reviewed-by: Satoru Takabayashi <satorux@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#701593} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 0bbcc5569581fbf220edd75e4f11a2b9a416fb82
2019-09-25Snap for 5897969 from 0214b93bfcbde85e53242dea0db52dfad66eaba5 to rvc-releaseandroid-build-team Robot
Change-Id: I85abe0a511724cc375fa1ce21a59e64ce39224d6
2019-09-24Merge "Add TEST_MAPPING that runs recovery_host_test." am: 42bbda4909 am: ↵Tao Bao
4288b7b391 am: 0258499e19 am: 084a9b55aa Change-Id: I43ac2ec6d67db2978d4beefe028bef77d1b733f7
2019-09-24Merge "Add TEST_MAPPING that runs recovery_host_test." am: 42bbda4909 am: ↵Tao Bao
4288b7b391 am: 0258499e19 Change-Id: Idc1c26202b2724ebe73917cf91be73df3f9082e2
2019-09-24Merge "Add TEST_MAPPING that runs recovery_host_test." am: 42bbda4909Tao Bao
am: 4288b7b391 Change-Id: I60be49cb9dfb8f1bdb983ae81b70b3253f8f18c6
2019-09-24Merge "Add TEST_MAPPING that runs recovery_host_test."Tao Bao
am: 42bbda4909 Change-Id: Ifcef1200e1224dfc171fe152e8b5e1b2eb6723ba
2019-09-24Merge "Add TEST_MAPPING that runs recovery_host_test."ndk-sysroot-r21Tao Bao
2019-09-24zlib: moving compression_utils_portable into own GN targetSam Maier
This allows other users of Chromium's zlib library who don't depend on //base (for example, V8), to reuse some boilerplate code. Bug: 833361 Change-Id: Ifc9023fdb9915e0452d424b030e8a8e5ae1c0df3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819838 Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Sam Maier <smaier@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#699386} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 2aaf3adf515925a75e945c69716a7087781f1891
2019-09-23Add TEST_MAPPING that runs recovery_host_test.Tao Bao
recovery_host_test, in particular imgdiff, relies on zlib for patch generation. Test: atest --host recovery_host_test Test: TreeHugger runs recovery_host_test. Change-Id: I8d6a14a9836cbe89d18a0233d691d961fc29dbd6
2019-09-11Snap for 5867156 from ae1701180f9236c0e7c1973b0b4d0c9c364efe0d to rvc-releaseandroid-build-team Robot
Change-Id: I8e6f0242d5de76ad718e15726a1d8470d899e06b
2019-09-09Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4" am: ↵Haibo Huang
28baf53049 am: 172c1c8929 am: 8ec531f2a8 am: 1a36b67443 Change-Id: If6c271993d947ff46bae2bf9f0a897afb57d1759
2019-09-09Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4" am: ↵Haibo Huang
28baf53049 am: 172c1c8929 am: 8ec531f2a8 Change-Id: I779309a5fb8fb870eef9a431fe8b388574f93108
2019-09-09Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4" am: 28baf53049Haibo Huang
am: 172c1c8929 Change-Id: I4629a911fede4696471f8965e60b18eb41d91d99
2019-09-09Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4"Haibo Huang
am: 28baf53049 Change-Id: Iaad1f46adf2a65b710db95e1153e448b8e67ae79
2019-09-10Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4"Haibo Huang
2019-09-10[TaskEnvironment] Remove old typesGabriel Charette
Explicitly (to document for git log purposes), this removes: - base::test::ScopedTaskEnvironment - net::WithScopedTaskEnvironment - net::TestWithScopedTaskEnvironment - content::TestBrowserThreadBundle - web::TestWebThreadBundle Mass migrate stragglers which landed under old names after initial mass migration. TBR=dcheng@chromium.org (to bypass owners for mechanical changes outside //base) Bug: 992483 Change-Id: I16cab3611b7f1a0a869f9f3af22d5b2952f91da6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1791271 Commit-Queue: Gabriel Charette <gab@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Auto-Submit: Gabriel Charette <gab@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#695003} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 2dfa2ba40a372f4a08ba0d051b5cbe5accf2c526
2019-09-09Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4Haibo Huang
Exempt-From-Owner-Approval: upgrade library Test: None Change-Id: I025bfc64960172aa0ea8460ef38c069203efa53c
2019-08-27Use android_ndk cpu_features targetSam Maier
cpu_features GN target moved from android_sdk to android_ndk TBR: minor rename of target Bug: 990407 Change-Id: I82e25a24716d73e17f2e19dd5e83e94b636b8b0f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756203 Auto-Submit: Sam Maier <smaier@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: Sam Maier <smaier@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#690799} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 801f0550ba72ea0021e97552ec9b98267b69f673
2019-08-23Reland "[TaskEnvironment] Complete migration with header rename"Gabriel Charette
This is a reland of 18947083c7e75ec6d5e8c3b729515d83bde41c59 The move_source_file.py script's formatting rules incorrectly formatted services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc after all. But we also can't rely 100% on git cl format (crbug.com/997063) so I ended up performing a git cl format && git add -up (+interactive addition of missing blank line after foo.h when included from top of foo.cc) Also added $ tools/git/move_source_file.py net/test/test_with_scoped_task_environment.h net/test/test_with_task_environment.h Original change's description: > [TaskEnvironment] Complete migration with header rename > > This is merely: > > $ tools/git/move_source_file.py base/test/scoped_task_environment.h base/test/task_environment.h > $ tools/git/move_source_file.py base/test/scoped_task_environment.cc base/test/task_environment.cc > $ tools/git/move_source_file.py base/test/scoped_task_environment_unittest.cc base/test/task_environment_unittest.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.h content/public/test/browser_task_environment.h > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.cc content/public/test/browser_task_environment.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle_unittest.cc content/public/test/browser_task_environment_unittest.cc > $ tools/git/move_source_file.py ios/web/public/test/test_web_thread_bundle.h ios/web/public/test/web_task_environment.h > $ tools/git/move_source_file.py ios/web/test/test_web_thread_bundle.cc ios/web/test/web_task_environment.cc > > and a few manual renames in DEPS files missed by the script > > This CL uses --bypass-hooks to avoid having to git cl format because > many headers are being reordered by git cl format and it's too many to > figure out in a no-op CL which ones are okay with it. > windows.h for one should typically be first and another one of the > reorderings in PS3 even caused a compile failure: > https://chromium-review.googlesource.com/c/chromium/src/+/1764962/3/components/services/font/font_loader_unittest.cc > > TBR=dcheng@chromium.org > > Bug: 992483 > Change-Id: I32a4afd43ef779393c95d9873c157be2d3da1dd1 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764962 > Reviewed-by: Gabriel Charette <gab@chromium.org> > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Commit-Queue: Gabriel Charette <gab@chromium.org> > Cr-Commit-Position: refs/heads/master@{#689778} TBR=dcheng@chromium.org Bug: 992483 Change-Id: I6179dd1329a4d30bf5c65450ea893537f31e6f85 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1767658 Reviewed-by: Gabriel Charette <gab@chromium.org> Commit-Queue: Gabriel Charette <gab@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#689794} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c7108748948a6ab308f323d6e72c59d29c7e240a
2019-08-23Revert "[TaskEnvironment] Complete migration with header rename"Gabriel Charette
This reverts commit 18947083c7e75ec6d5e8c3b729515d83bde41c59. Reason for revert: broke Win Original change's description: > [TaskEnvironment] Complete migration with header rename > > This is merely: > > $ tools/git/move_source_file.py base/test/scoped_task_environment.h base/test/task_environment.h > $ tools/git/move_source_file.py base/test/scoped_task_environment.cc base/test/task_environment.cc > $ tools/git/move_source_file.py base/test/scoped_task_environment_unittest.cc base/test/task_environment_unittest.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.h content/public/test/browser_task_environment.h > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.cc content/public/test/browser_task_environment.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle_unittest.cc content/public/test/browser_task_environment_unittest.cc > $ tools/git/move_source_file.py ios/web/public/test/test_web_thread_bundle.h ios/web/public/test/web_task_environment.h > $ tools/git/move_source_file.py ios/web/test/test_web_thread_bundle.cc ios/web/test/web_task_environment.cc > > and a few manual renames in DEPS files missed by the script > > This CL uses --bypass-hooks to avoid having to git cl format because > many headers are being reordered by git cl format and it's too many to > figure out in a no-op CL which ones are okay with it. > windows.h for one should typically be first and another one of the > reorderings in PS3 even caused a compile failure: > https://chromium-review.googlesource.com/c/chromium/src/+/1764962/3/components/services/font/font_loader_unittest.cc > > TBR=dcheng@chromium.org > > Bug: 992483 > Change-Id: I32a4afd43ef779393c95d9873c157be2d3da1dd1 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764962 > Reviewed-by: Gabriel Charette <gab@chromium.org> > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Commit-Queue: Gabriel Charette <gab@chromium.org> > Cr-Commit-Position: refs/heads/master@{#689778} TBR=dcheng@chromium.org,gab@chromium.org Change-Id: I9aa8ff558d1ff78cebe0c25e559c017578ad4f53 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 992483 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1767657 Reviewed-by: Gabriel Charette <gab@chromium.org> Commit-Queue: Gabriel Charette <gab@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#689780} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: b69fcd4f6e1b327f0e3e4570e93213d313d799f3
2019-08-23[TaskEnvironment] Complete migration with header renameGabriel Charette
This is merely: $ tools/git/move_source_file.py base/test/scoped_task_environment.h base/test/task_environment.h $ tools/git/move_source_file.py base/test/scoped_task_environment.cc base/test/task_environment.cc $ tools/git/move_source_file.py base/test/scoped_task_environment_unittest.cc base/test/task_environment_unittest.cc $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.h content/public/test/browser_task_environment.h $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.cc content/public/test/browser_task_environment.cc $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle_unittest.cc content/public/test/browser_task_environment_unittest.cc $ tools/git/move_source_file.py ios/web/public/test/test_web_thread_bundle.h ios/web/public/test/web_task_environment.h $ tools/git/move_source_file.py ios/web/test/test_web_thread_bundle.cc ios/web/test/web_task_environment.cc and a few manual renames in DEPS files missed by the script This CL uses --bypass-hooks to avoid having to git cl format because many headers are being reordered by git cl format and it's too many to figure out in a no-op CL which ones are okay with it. windows.h for one should typically be first and another one of the reorderings in PS3 even caused a compile failure: https://chromium-review.googlesource.com/c/chromium/src/+/1764962/3/components/services/font/font_loader_unittest.cc TBR=dcheng@chromium.org Bug: 992483 Change-Id: I32a4afd43ef779393c95d9873c157be2d3da1dd1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764962 Reviewed-by: Gabriel Charette <gab@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Commit-Queue: Gabriel Charette <gab@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#689778} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 18947083c7e75ec6d5e8c3b729515d83bde41c59
2019-08-17Snap for 5811156 from 0200227b067fb477b66767f05f08054378182aba to rvc-releaseandroid-build-team Robot
Change-Id: Ia5758d2fca657ecc3d7c8f02194d821066336a22
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933" am: ↵Elliott Hughes
94f14f9521 am: dbce09173f am: b93d21f21a am: d176c58810 am: a0b3dd4393 Change-Id: Ie11451f4614acf72ca83e6736f489bcf2a9e7494
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933" am: ↵Elliott Hughes
94f14f9521 am: dbce09173f am: b93d21f21a am: d176c58810 Change-Id: Ie3da401421f69e0d76b12d41f657551737437023
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933" am: ↵Elliott Hughes
94f14f9521 am: dbce09173f am: b93d21f21a Change-Id: I5af6370e4b6b9575d2b9cff95199b6c8e430a19c
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933" am: 94f14f9521Elliott Hughes
am: dbce09173f Change-Id: I2ab94e6de13d24aa7d6761c10fd0a3ed05f6db0b
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933"Elliott Hughes
am: 94f14f9521 Change-Id: I9adbe154c610bec8eb4a977ff5665d644fe8f524
2019-08-15Merge "Upgrade zlib to ddd7b06cf8c34e638643f7ce888bfc7c56e96933"Elliott Hughes
2019-08-15Snap for 5803748 from 82a9010971568ab6c7dfc55fc41c3bc63847f0c6 to rvc-releaseandroid-build-team Robot
Change-Id: I2d4cb94601364733c5c9dce9f695a5831d8d8d7b
2019-08-14Merge "Revert "Track upstream change 796333a8."" am: f78ade15c9 am: ↵Elliott Hughes
7d50cd994d am: ce48a0e67e am: 76a99a282c am: abd26b68ce Change-Id: I6fc2c761584e5a27cf1abbb944f780311324174d
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 09:28:22 +0000