| commit | f2568a5d11c78242d4f6e819a63fb9de5c32819f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 19 21:21:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 21:21:39 2015 +0000 |
| tree | 42ecaa24894dc2dd56f6eebe8145920256e60c68 | |
| parent | ab914a6cdaed6942e83ec71086b2a0b45a1a6448 [diff] | |
| parent | 43cf00fe5850cbffec8f9af151de7d09eda3636b [diff] |
am 43cf00fe: am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev * commit '43cf00fe5850cbffec8f9af151de7d09eda3636b': Increase polling timeout