| commit | b29a9b3d2b546756a2025fbf8a6b02ec35206588 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Thu Nov 14 23:29:31 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 14 23:29:31 2024 +0000 |
| tree | ca17ced20ab8fe3218813b45f3b1c7b721227ec2 | |
| parent | 447d57e8cf6e7fe06f21e2a51020ebca355a51a9 [diff] | |
| parent | 2d81685053299251742ea13c8c06b0b7d3c3f553 [diff] |
[automerger skipped] Merge "Adding status and end date to SubscriptionPlan" into main am: fe3feeb116 am: 2d81685053 -s ours am skip reason: Merged-In Ia6d11cb54befdf92dbabb6abe84fd59d18e1c6b3 with SHA-1 be222d811f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3340901 Change-Id: Iaa4a84772bec03c24ccf20087f2e26d9b90f4b85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>