| commit | 46ad13f2c2899836f145841953fc7729f0c2a33f | [log] [tgz] |
|---|---|---|
| author | Wu Ahan <ahanwu@google.com> | Thu Dec 09 03:28:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 09 03:28:48 2021 +0000 |
| tree | ce88f12d1eb067a97e143071a05fd30667695952 | |
| parent | f4f9036b85a9895ed0911b00b73a0a79a3383ab5 [diff] | |
| parent | 94f224ba982ebb4bc8c7a80f58bdd3c846e81916 [diff] |
[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours am: 712a05c34b -s ours am: bf23a64da9 -s ours am: 862c1c871a -s ours am: cff660f915 -s ours am: 94f224ba98 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375907 Change-Id: I2d64ac500996508f20a77c7a902fae10f1867dd9