| commit | 55306cce637b39bb7010a08a97768699532b93ee | [log] [tgz] |
|---|---|---|
| author | Wu Ahan <ahanwu@google.com> | Thu Dec 09 03:45:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 09 03:45:43 2021 +0000 |
| tree | c160a1b6bdc06df6f10c40f391a75eed900df55a | |
| parent | 27876f3ee45a1f22806b3e9ae673cccb6b83eafd [diff] | |
| parent | f4f9036b85a9895ed0911b00b73a0a79a3383ab5 [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: eac6df28b8 -s ours am: f4f9036b85 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379915 Change-Id: I26ada04f92292b272a02b9c9a4ace9f355db4123