Merge version 29.0.6-25+rpi1 and 29.0.6-26 to produce 29.0.6-26+rpi1

diff --cc debian/changelog
index 3f4b55c4d8cf25e9a8f01e82eb51ccaac0a45caf,19e067d773a26f91e0eec356b05b3e5e2173912e..795fcaf9197ed4813fcb58204d7babc72f1128d5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- android-platform-tools (29.0.6-25+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-26+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Mar 2022 22:50:07 +0000]
 +  * Build with clang-11 to avoid armv7 contamination.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Jan 2023 11:55:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Feb 2023 21:57:21 +0000
++
+ android-platform-tools (29.0.6-26) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control: Another try to fix pandoc/ronn.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Mon, 30 Jan 2023 23:58:29 -0800
  
  android-platform-tools (29.0.6-25) unstable; urgency=medium
  

diff --cc debian/control
Simple merge