Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b29a9b3d authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Adding status and end date to SubscriptionPlan"... 

[automerger skipped] Merge "Adding status and end date to SubscriptionPlan" into main am: fe3feeb1 am: 2d816850 -s ours

am skip reason: Merged-In Ia6d11cb54befdf92dbabb6abe84fd59d18e1c6b3 with SHA-1 be222d81 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3340901



Change-Id: Iaa4a84772bec03c24ccf20087f2e26d9b90f4b85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 447d57e8 2d816850
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment