Merge "Only use IMS for E911 if VoLTE is supported on device/carrier." into mnc-dev
Etan Cohen [Tue, 4 Aug 2015 00:30:34 +0000 (00:30 +0000)]

Trivial merge