commit | 248121635362cb6458a4ad685531bb6d3364357d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 29 01:11:07 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 01:11:07 2023 +0000 |
tree | 3d838dc163ed48dadb670aa912e7bb8d85c3f8a0 | |
parent | 3700ec8f60cfbb47d4ad4c0cd5dbb6230147cd94 [diff] | |
parent | 1ab1cf7089eda326b9c5ddf8d03e5b7024baf62d [diff] |
[automerger skipped] Merge Android U (ab/10368041) am: 7104e56ac7 -s ours am: 937756af58 -s ours am: 1ab1cf7089 -s ours am skip reason: Merged-In I698bbf58bf8dbf3687ca8f642260a274a9fa2948 with SHA-1 153a04d123 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/24181015 Change-Id: Ic70b0498e4ab9aa3686e666785405966148a4c30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>