Merge "Do not allow default SMS application to be set or get on non-phone devices...
David Braun [Mon, 7 Oct 2013 18:10:44 +0000 (18:10 +0000)]

Trivial merge