| commit | 280d70fa471cd81a4d8b778d875d684e80a0c9c8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 19 21:48:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 21:48:49 2015 +0000 |
| tree | 9599d2356738ae810e6cf79ec55ff410a21a8705 | |
| parent | 95696480091a8942d29c9e7667944bde11f2cbfe [diff] | |
| parent | 7219c478b6ffc1f0481ddc08964d731014e56ea1 [diff] |
am 7219c478: am f2568a5d: am 43cf00fe: am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev * commit '7219c478b6ffc1f0481ddc08964d731014e56ea1': Increase polling timeout