| commit | 6360c53fd0e8598e971c7365e49c4e68eb09f87a | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Wed Feb 19 01:17:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 19 01:17:56 2014 +0000 |
| tree | 68d1f9443d6a928e3498fdf2545e7b25d6bb2852 | |
| parent | 6f013be090fcbec5e36c5a7bce98728373c8dcc1 [diff] | |
| parent | c36faf6cfbafe2b9493fd9a5213a5c490f193085 [diff] |
am c36faf6c: am 37fb58b9: Merge "Add up to 6 10 second delays to wait for sms" * commit 'c36faf6cfbafe2b9493fd9a5213a5c490f193085': Add up to 6 10 second delays to wait for sms