| commit | e1f2824ac180e019194b8c75a61bc6c91779b552 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 02 14:53:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 02 14:53:55 2012 -0700 |
| tree | a767d77ae7f7eb2d0603856a80d4a0b0157630c1 | |
| parent | c8136f058b5d76be8b5a31741baa66743cad2fb5 [diff] | |
| parent | 5709f43dd80ed9e3264eaca098f05d9e59c8b937 [diff] |
am 5709f43d: (-s ours) Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp * commit '5709f43dd80ed9e3264eaca098f05d9e59c8b937': Revert "DO NOT MERGE: Remove SMS shortcode warning feature."