tree f3dbccb96f203fe47f1560c0d475b3dbb8215d06
parent 5852813e6cc2a0e67e9fd641d94383d8d7effc62
parent 1d49df75eb8ccd6d4db8bdadc0f42ec7db8dcbf5
author Wu Ahan <ahanwu@google.com> 1639017607 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639017607 +0000

[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: 3b44a185d6 -s ours am: fd6b42db79 -s ours am: 1d49df75eb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I726d396b9952e607a121ef8bfcd5e1696c39dc33