| commit | fdf6eedb1056242d657c598dc3a2bccfc12b8246 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Mon Nov 01 20:51:41 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 01 20:51:41 2021 +0000 |
| tree | 66f9739aed7517e238ce5dc813d2d3c6669ddb9b | |
| parent | cd12f1b260a0504615317401c8c2516fd22e45fa [diff] | |
| parent | 5c80561b44179225109c0c723d4915def779bcab [diff] |
Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev