tree d828e506d4ddfc1fac210b774b250e23c580efe8
parent 4650e5cdf139763875e5d53cc24dd5b32b8db27e
parent e4ad87bb3d9065fc269b3fc47c08745976449586
author Wu Ahan <ahanwu@google.com> 1639019154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639019154 +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 skip reason: subject contains skip directive

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

Change-Id: Ie9d2092b987ef7e4eda9d9af6b35f4f4ae47e6e4