tree 41a29f2525a405ea0872d6a2d891e6168f8b783d
parent 55ba19a4af348776d1f9aaf8311e6b95999e9df1
parent 14985d3e9dca629ed25ca7b009df1b1e22f49d9a
author Wu Ahan <ahanwu@google.com> 1642634614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642634614 +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: 5ce8479b9a -s ours am: 14985d3e9d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I688dea9b93ffd60db8e8c076607d378aee443527