tree eed9b3e611993190a33a379c202e3fb274ee8858
parent f832270a851b9d3e1d635bd27601b32cf7825f91
parent 1a17ae5c9bf2efed3b1c48cc0389a95eaa918878
author Jayant Chowdhary <jchowdhary@google.com> 1628525141 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628525141 +0000

[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours

am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I8a13d5856b2686c647a3708f83ee0c56d1dcdb08