| commit | 64ed1acee10a2f1fe8f0cdc6fcb7253549e8465a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jan 20 00:18:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 20 00:18:46 2022 +0000 |
| tree | 0a2882816e52825aa6c458a73a0de431a59c35f9 | |
| parent | 772e5b894ee358eac72e2c1e22d3af7377f1b9e9 [diff] | |
| parent | 24b6a2a3a1c0872f02e510ca7897a4e3b1fe66d8 [diff] |
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: da52474c71 -s ours am: d38a74d2b6 -s ours am: c3571ee944 -s ours am: fe4ceea7e1 -s ours am: 24b6a2a3a1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308 Change-Id: If49488218f2efa935fc67d03e8b0968fe461f3b6