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