| commit | 42e6fc36db324ab6392356ed6f302d750ae49d4b | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Fri Oct 23 18:35:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 18:35:49 2020 +0000 |
| tree | e2bc2ac8f68157ca8c0890b4d1e019d8839fb08d | |
| parent | a230de92fec3a6963f4f0af3fa4f32bdb8990fed [diff] | |
| parent | 049001bac41f7c2b7a8240a9f16e1ba750e99e81 [diff] |
[automerger skipped] Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995bc am: 19519ff57f -s ours am: 049001bac4 -s ours am skip reason: Change-Id Ib821590a573db87b22619cfe7ebe64c0230c5031 with SHA-1 8fce85a6f8 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438917 Change-Id: I85c3a7fdf5ce03cca230202a751a699872c3b48d