| commit | c36faf6cfbafe2b9493fd9a5213a5c490f193085 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue Feb 18 17:15:55 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 18 17:15:55 2014 -0800 |
| tree | 8316de65725ce57d9ea7ed1b58b15f3bd90881ea | |
| parent | de38dc7279c9e5cea6d4255b3614625895646a70 [diff] | |
| parent | 37fb58b9ce11e8ecb2e4998e49ac8e2bce825d0d [diff] |
am 37fb58b9: Merge "Add up to 6 10 second delays to wait for sms" * commit '37fb58b9ce11e8ecb2e4998e49ac8e2bce825d0d': Add up to 6 10 second delays to wait for sms