tree 6e8758e5b16ad10a95f5befe8d9b755dc475eef1
parent bcd8ab4b70563719905ee62153932c8fd40c9aa2
parent 03f15493accb43417de96d9ef8475d507b660238
author TreeHugger Robot <treehugger-gerrit@google.com> 1642633508 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642633508 +0000

[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb am: 49a8f9ebd7 -s ours am: c14fe55f10 -s ours am: 03f15493ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I22629213521127b9553026b3831c33b547a091bc