tree 4be7e7f698b313676bb4905d5594eb3cff40ee11
parent 3f7cd8db4d6a515b7541959701f656ab77b5de59
parent 1c47be4fced7d617b7c05350997cb9da5bb4d641
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1704814171 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1704814171 +0000

Merge changes from topic "am-6e49f3db6dd44f3ba4b8bd688225b20a" into main

* changes:
  Merge "[RESTRICT AUTOMERGE] uchar/wchar tests: allow both Android 14 and 2024Q1 behaviors." into android14-tests-dev am: 82decc79bf
  [automerger skipped] [RESTRICT AUTOMERGE] uchar/wchar tests: allow both Android 14 and 2024Q1 behaviors. am: 30fc7dee98 -s ours