tree fed7ba5e411c84cf3d9171d3bd81be4686731661
parent 9fb66a398105bde6dd7205e19527dbd2bacdab69
parent 8978f2dbacaf5e43074f76275749cdf218eec488
author Robert Greenwalt <rgreenwalt@google.com> 1524512401 -0700
committer android-build-merger <android-build-merger@google.com> 1524512401 -0700

Merge "Revert "Add ALTECOM and FIBRACAT MVNO settings"" am: 1b40b1e341
am: 8978f2dbac

Change-Id: I616ef98ad7c5c4d9d0d18011fe1f832393671e11