commit | 66a37b067b9bd9eb25487cd6f729e9f5a81ece0e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jan 19 23:22:46 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 19 23:22:46 2022 +0000 |
tree | 5caf65ba55f68feee77fc5b389b78b2264834334 | |
parent | c6cc906c27fbafb99ccfd848b8fdc5b0af76abec [diff] | |
parent | d38a74d2b62d53f028d1ed7d83a6f1c1b9a1b331 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308 Change-Id: I77b33ca2a46c9b8b76c31f9038d46139ff0287e9