tree 6e8758e5b16ad10a95f5befe8d9b755dc475eef1
parent dcf263a2bc7869b9dc7ccc3e3600d637673487d1
parent 806633ad66c8fb08f3fd9070fcac05dc273bf0a5
author TreeHugger Robot <treehugger-gerrit@google.com> 1642631670 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642631670 +0000

Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140 am: 806633ad66

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

Change-Id: I4eb770f4fc9d701021a127e5d6368d35fd3d5cd4