Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev
Amit Mahajan [Wed, 8 Oct 2014 00:27:19 +0000 (00:27 +0000)]

Trivial merge