tree f29e28c34529f40c18b413098d9be24bc67f0985
parent 81a32d5eb552e34f3c26771743aa0a12ef013d92
parent 9523520806d6fc37401576faac7afef4daecd27d
author TreeHugger Robot <treehugger-gerrit@google.com> 1642632299 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642632299 +0000

[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8cfa0e06b4ad7d7356a2157ca41005ef61b98538