OSDN Git Service

Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 2 Jul 2012 21:48:48 +0000 (14:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 Jul 2012 21:48:48 +0000 (14:48 -0700)

Trivial merge