tree 7ae05a1341c32992a9ed773b8a1d0f188f6ab7e3
parent 1ae887c0e9fe653a6224ea2c8f58ec4950276843
parent 2be97bbf3348658fefea6f3d211d23f9cc95ac32
author Wu Ahan <ahanwu@google.com> 1642635965 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642635965 +0000

[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 81a32d5eb5 -s ours am: 4fc95f8684 -s ours am: 2be97bbf33 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifbf8ded237565297f17971a8b5184199a1a9caf1