| commit | c31090f0e23467a25c7fe1f90758a29ba0be596b | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Mon Mar 21 16:46:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 21 16:46:03 2022 +0000 |
| tree | 7e23fb461853a57fda1523a3402028f1c806248e | |
| parent | 10cb4386c32fdcc01ee4d8f84176dc72a993e7d5 [diff] | |
| parent | 032593aa03d8429ddbbbb1ee980e919132a3adbe [diff] |
[automerger skipped] Merge "Ensure SubscriptionPlans can be removed" am: 0bf5d39174 am: 835d1bd085 am: 032593aa03 -s ours am skip reason: Merged-In I93aece78eda324c333fbf9f1adbedcf46e4864f0 with SHA-1 e6f17feb77 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032903 Change-Id: I70c8b000f5120f8f7039aa18d2ccee24198c9034