tree f3ab425cee2660b00bef344894ff95335ddb1ca1
parent 5ddf003cb2957672038bf1db397422402dce930a
parent 004ff5ad2aa02daff607bcf1712f3efbb84c58ca
author Jake Hamby <jhamby@google.com> 1339016484 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339016484 -0700

Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev