| commit | 58c26d9505db5e2768af03703b5f94647df34b6b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 22 01:53:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 22 01:53:48 2014 +0000 |
| tree | 9534d35aa0480f91afe05811386cb2e9382030e0 | |
| parent | c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc [diff] | |
| parent | 9a59d411cbe68d6027c541854c6d7c1348e4ee3d [diff] |
am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." * commit '9a59d411cbe68d6027c541854c6d7c1348e4ee3d': Restore accidentally-removed NULL timeout.