| commit | 33fe36ad3b5a47c2436fcf4d941632909d72cab9 | [log] [tgz] |
|---|---|---|
| author | Wu Ahan <ahanwu@google.com> | Thu Dec 09 03:25:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 09 03:25:39 2021 +0000 |
| tree | ce88f12d1eb067a97e143071a05fd30667695952 | |
| parent | 681ec271f4a68ecfa387349ba3a8b965d561add6 [diff] | |
| parent | fc06cb8634b4f7d2e1b95750e25e1f65b00b3dbb [diff] |
[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours am: d6e95039fd -s ours am: d2a7720607 -s ours am: e4ad87bb3d -s ours am: fc06cb8634 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379915 Change-Id: I2b02ad5428bb0f6aabbf6ebec092a0fef4ba469b