commit | 776138a93898491739352f9d599fa048e943d6b6 | [log] [tgz] |
---|---|---|
author | LaMont Jones <lamontjones@google.com> | Tue Nov 08 01:04:52 2022 +0000 |
committer | LaMont Jones <lamontjones@google.com> | Tue Nov 08 18:49:16 2022 +0000 |
tree | d2d89fd4069d553e3019e2954cbaa9e6b6c4f354 | |
parent | 859d3d958057e35b618e8cca209a85317d49a974 [diff] | |
parent | 5fb9c6a5b35220e27b3acd5861318584588cd0d8 [diff] |
Merge branch stable into main (--strategy=ours). This will allow the next repo release to be a fast-forward on stable. * origin/stable: v2.29.7: Revert back to v2.29.5 Change-Id: I3e52f76766807c58f56d3e246fa142ed55ede59b