commit | 813fb84e7a74a7ac901409f8f876314192f992be | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Dec 28 18:39:39 2022 +0000 |
committer | Jordan Demeulenaere <jdemeulenaere@google.com> | Fri Dec 30 09:46:18 2022 +0000 |
tree | 2f174e9777730427c4c2e01cbf3f4ac14f2268ea | |
parent | 6176ef97e087dfcfc3842a62f0d49275b213b4d2 [diff] | |
parent | 62a8398031f4b4b02120efee3d6403c30d44311d [diff] |
[conflict] Merge "Rename SystemUIComposeCore to PlatformComposeCore (1/2)" into tm-qpr-dev am: 62a8398031 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20803453 Change-Id: I6bc476444ded867610b318bc04c0012d3ba77f09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>