[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: 25f8c85ab5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308 Change-Id: Ic851a03c57f5c84d01ec62fa88a0616665b8a8d5
This commit is contained in: