From: Mathieu Chartier <mathieuc@google.com>
Date: Mon, 4 May 2015 17:30:47 +0000 (+0000)
Subject: am b2a62122: am a6f2a7e0: Merge "Fix NanoSleep and add test"
X-Git-Tag: android-x86-6.0-r1~214^2~62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fceb712e7fa2c7a4411a0535d2499355c6641dd9;p=android-x86%2Fart.git

am b2a62122: am a6f2a7e0: Merge "Fix NanoSleep and add test"

* commit 'b2a62122e8f512915836a12a703b2567cebddd99':
  Fix NanoSleep and add test
---

fceb712e7fa2c7a4411a0535d2499355c6641dd9