tree 3038577417c10ecd54172df66999a422fdc9d70b
parent 1217d5761015592da6952757f4b55df28a934be7
parent 35897ca05cda7093b17ff5f3b93d28b6e27cc7be
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714164193 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1714164193 +0000

Merge changes from topic "am-c032716d499842109b0e8c370d05adbd" into android14-tests-dev

* changes:
  Merge changes from topic "am-e519fa97a79e4646ae15a54b8cdeb978" into android13-tests-dev am: 6f5a7d3d48 -s ours
  [automerger skipped] Merge "Merge "Camera: Revise hardware level requirement for MPC" into android12-tests-dev am: 49e73bef1e" into android12L-tests-dev am: 0c49ba971b -s ours am: 7d43bb5dc1 -s ours