| commit | 4943340a0bbb0c917dcb78e31a9716c20c692330 | [log] [tgz] |
|---|---|---|
| author | Georgi Nikolov <geonik@google.com> | Tue Aug 26 18:41:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 18:41:53 2014 +0000 |
| tree | 99ba18815054b4e1d7cb6c473915c41bdff44569 | |
| parent | 32f7d677c23fa9d85268074d1cda650e955bce94 [diff] | |
| parent | 97f3d7e093f2fa3a186b63c118ec58923597a68a [diff] |
am de1ee2fa: am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev * commit 'de1ee2fa43d18a1bd877c382e15164f692968bde': Add maximum time-out to sync operation