tree c160a1b6bdc06df6f10c40f391a75eed900df55a
parent e3bf76136bf5510fb65ce2e069fba21437069095
parent 398cb368979e4b4912a05be645170ee6a7c8d604
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639019048 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1639019048 +0000

Merge "[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: e68b30a205 -s ours am: 9f9bf3e6b3 -s ours"