tree 895f8afbab5bd3e65296ffe68e23ee816c6a5d06
parent 1d0a27888c69f46ea95b56f769d3c5a848917302
parent e5a532907860d0c7dda41ddf0f396265e94e9110
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1653622600 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1653622600 +0000

Merge changes from topic "am-1bc6dfdb03ce46beaef9bbdf6650a1d2" into tm-d1-dev-plus-aosp

* changes:
  Merge "RESTRICT AUTOMERGE Ignore weak symbol difference in libui ABI check" into tm-dev am: 5f0d32a698 am: 5fc5448901
  RESTRICT AUTOMERGE Ignore weak symbol difference in libui ABI check am: 45913f2d16 am: f3e35bc9d1