[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: ab3c7eb753 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379914 Change-Id: I11f3e864bb515f9a11bf12ee13d6bed4afe10814
This commit is contained in: