tree 1d14a865145602d078cf4b0e2af1efbd851c0bf3
parent 68d5dd82dbafa8c41095fddc62ab7a162f594820
parent 8ef29784e1546a58f556aacaceafab5ad513aba7
author TreeHugger Robot <treehugger-gerrit@google.com> 1647893026 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1647893026 +0000

Merge "Fix Proto compilation on M1 Macs" into tm-dev