tree 7382f3c88061e2d5e52716c8d43182132b2173d4
parent d21dc21258c427320e1d3731d6a4a4b26278a30e
parent 4b66e3d2dd1c15f34ab7a05746e31c8c5570f3ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1682976080 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1682976080 +0000

Merge "Rename some string resources to prevent name collision" into androidx-main