tree 212dcdf225a009d8d657b3e08bf85209d2c8ae33
parent 4fc95f86848e6ca5747cdd8b4eae25bbf3c19704
parent 5c2e89e2686e5cf02d2e1947831d32c8fdf0d67b
author TreeHugger Robot <treehugger-gerrit@google.com> 1642633414 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642633414 +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: 5c2e89e268 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If81def7bc1defd58ffb6283dcda5cabc4a6e923d