| commit | 61681054e0863697b029eb31047fa056e6bc2b15 | [log] [tgz] |
|---|---|---|
| author | Wu Ahan <ahanwu@google.com> | Thu Dec 09 02:48:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 09 02:48:31 2021 +0000 |
| tree | ce88f12d1eb067a97e143071a05fd30667695952 | |
| parent | 9f9bf3e6b318300c3b92840ee5d6bcef23b4e455 [diff] | |
| parent | 3617d596ca91fd17bbd3289ba4a2ccfc1b6b2488 [diff] |
[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: ab3c7eb753 -s ours am: fe082e2419 -s ours am: 6b1a7ca0d8 -s ours am: 3617d596ca -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379914 Change-Id: I77302c20b6ce60fc50dde6fd97f52fd28c7127d7