| commit | eebd4b046420484c0b891da517557eb34988fbd9 | [log] [tgz] |
|---|---|---|
| author | Chris Li <lihongyu@google.com> | Wed Jun 15 15:09:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 15 15:09:49 2022 +0000 |
| tree | 442c1210bcf598829d2a47fd28fb5163162bc616 | |
| parent | dc9b9f6d8316e8121339cb98c9e4652ac86d1a9f [diff] | |
| parent | 9f4f8fe70a40110676643b9012a2d15ec79d38bc [diff] |
[automerger skipped] Merge "Fix the problem that the turn_screen_on Activity does not draw." am: 76c76a86c4 am: 9f4f8fe70a -s ours am skip reason: Merged-In I60b2da453da0ac5c4df6e5a1040defe4bfe726ec with SHA-1 c6c0d0da5c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2120896 Change-Id: Ieb0437728f441ebf316fee25fff4b7187b6fd846 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>