From: Christopher Ferris <cferris@google.com>
Date: Wed, 4 Feb 2015 02:08:44 +0000 (+0000)
Subject: am 50ad67e4: Merge "Add better timeout mechanism for running commands."
X-Git-Tag: android-x86-6.0-r1~75^2~74
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=16c62c468aacf40496a7cad94f49795a797cdd37;p=android-x86%2Fframeworks-native.git

am 50ad67e4: Merge "Add better timeout mechanism for running commands."

* commit '50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
  Add better timeout mechanism for running commands.
---

16c62c468aacf40496a7cad94f49795a797cdd37