From: Elliott Hughes Date: Thu, 22 May 2014 01:53:48 +0000 (+0000) Subject: am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." X-Git-Tag: android-x86-6.0-r1~1918^2~21 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58c26d9505db5e2768af03703b5f94647df34b6b;p=android-x86%2Fframeworks-av.git am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." * commit '9a59d411cbe68d6027c541854c6d7c1348e4ee3d': Restore accidentally-removed NULL timeout. --- 58c26d9505db5e2768af03703b5f94647df34b6b