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