| commit | 3d0e4a42a904c8502285f44e81cb8de2d2ecf40e | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Tue Dec 13 21:12:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 13 21:12:35 2022 +0000 |
| tree | 0af6b0bb4520ac09daf03223dfd2bf98e883c29a | |
| parent | fc2290ec40e60e9e15543a9d908699468e1512dc [diff] | |
| parent | 4d26393bce9ec59d925895b8a606c4a9bc56e889 [diff] |
Merge "Don't re-lock if we're wake and unlocking." into tm-qpr-dev am: 5bd31e0391 am: 4d26393bce Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20650080 Change-Id: I3d2f85c1190556ebca26cd3b2bbbc5577e34cc45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>