tree eed9b3e611993190a33a379c202e3fb274ee8858
parent cfb14e77702d8395aff1cfec08a2cf2169cf1b06
parent 020f357bc96d74501e0935b75909ce91ec04ae00
author Jayant Chowdhary <jchowdhary@google.com> 1628526275 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628526275 +0000

[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours

am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ic3a803fba666a1166c2ac1e996c8d898966294d3