OSDN Git Service

am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
authorElliott Hughes <enh@google.com>
Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)
commit9a59d411cbe68d6027c541854c6d7c1348e4ee3d
treed1dba2688eb058cf42c1bf23f100ed7653a7e78a
parentad71caf25e31ecfc4ecf2c925e38fd87905fbc8e
parent85e6e87c41bba51729cee8958a5c30157c8dc674
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '85e6e87c41bba51729cee8958a5c30157c8dc674':
  Restore accidentally-removed NULL timeout.