| commit | 6022de3616284671a6047cb0b04180ce16a69b8c | [log] [tgz] |
|---|---|---|
| author | Evan Chen <evanxinchen@google.com> | Tue Nov 09 01:38:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 09 01:38:23 2021 +0000 |
| tree | 320ecfa7deb4a7f3abc42ac561e2524980ec0e8b | |
| parent | 6bb6064158eb301f1a29c7c75e42bb7a4bef412e [diff] | |
| parent | 79ecb086fd8954c14697e464a21fe9d6a4ec345e [diff] |
[automerger skipped] Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev am: efea2ad2d9 am: 79ecb086fd -s ours am skip reason: Merged-In Icecd76d6ff5a81afdcdb7d584ae3ecff51ac5dc3 with SHA-1 0f88f8c9a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214942 Change-Id: I55ea2dd2ac39ebfe13114449bc91944210a76535