| commit | 096a5c5a8e4878666d4eb0c2098cdfffe4a04626 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Mon Nov 01 20:54:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 01 20:54:56 2021 +0000 |
| tree | 608727eca210ca353eeb26f8147a50fb0e2453f3 | |
| parent | 62c0e2020e24dfc00603bcb9da4f0d2cfc0b9f74 [diff] | |
| parent | fdf6eedb1056242d657c598dc3a2bccfc12b8246 [diff] |
Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev am: fdf6eedb10 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150706 Change-Id: Ieaaa85134e0f31cc322d63d4974aee8e3596ec6e