| commit | 9a59d411cbe68d6027c541854c6d7c1348e4ee3d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 22 01:49:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 22 01:49:44 2014 +0000 |
| tree | d1dba2688eb058cf42c1bf23f100ed7653a7e78a | |
| parent | ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e [diff] | |
| parent | 85e6e87c41bba51729cee8958a5c30157c8dc674 [diff] |
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." * commit '85e6e87c41bba51729cee8958a5c30157c8dc674': Restore accidentally-removed NULL timeout.