am cd9f8ea3: am 665935c1: Merge "Enable SMS short code patterns to be updated...
am cd9f8ea3: am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev
* commit 'cd9f8ea3':
Enable SMS short code patterns to be updated from secure settings.