| commit | 680d2625fd57f94f2253531d63b607ce96245bda | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 24 20:30:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 24 20:30:57 2021 +0000 |
| tree | 6a948f534c276b01409c7ec93890c0e3896cacc7 | |
| parent | cca005c11f9085192c34b7bc4c2ae502c3ec7384 [diff] | |
| parent | b48fe9f748107a1cb2ed39ca46c6eeeba317a96a [diff] |
[automerger skipped] Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 am: b48fe9f748 -s ours am skip reason: Merged-In Iacd46b99c5a86c8f7a7706b91b0b78a3beb4c414 with SHA-1 b7299f30ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15660797 Change-Id: I2f5a7316ab6716cd385a97c61d503c8c0e7335c6