From: Elliott Hughes <enh@google.com>
Date: Thu, 22 May 2014 01:45:47 +0000 (+0000)
Subject: Merge "Restore accidentally-removed NULL timeout."
X-Git-Tag: android-x86-6.0-r1~1904^2~13^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85e6e87c41bba51729cee8958a5c30157c8dc674;p=android-x86%2Fframeworks-av.git

Merge "Restore accidentally-removed NULL timeout."
---

85e6e87c41bba51729cee8958a5c30157c8dc674