| commit | 15aa7eb55fcca35f3868831913a9de42a4928e9b | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue May 13 15:18:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:18:47 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | 0eda8a786f3c9ed2b22e0e28ef8dd145e7d42665 [diff] | |
| parent | 6360c53fd0e8598e971c7365e49c4e68eb09f87a [diff] |
am 6360c53f: am c36faf6c: am 37fb58b9: Merge "Add up to 6 10 second delays to wait for sms" * commit '6360c53fd0e8598e971c7365e49c4e68eb09f87a':