tree ce88f12d1eb067a97e143071a05fd30667695952
parent 970c811a6ae70c3b93a82efb9a255b30b6cd28bc
parent eac6df28b811d5e4e1816b926f2a5c63dbecb09d
author Wu Ahan <ahanwu@google.com> 1639020503 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639020503 +0000

[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours am: d6e95039fd -s ours am: d2a7720607 -s ours am: e4ad87bb3d -s ours am: eac6df28b8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I95614ebf5a54c229ff19ca6f23b24f724ccdb985