OSDN Git Service

am b2a62122: am a6f2a7e0: Merge "Fix NanoSleep and add test"
authorMathieu Chartier <mathieuc@google.com>
Mon, 4 May 2015 17:30:47 +0000 (17:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:30:47 +0000 (17:30 +0000)
* commit 'b2a62122e8f512915836a12a703b2567cebddd99':
  Fix NanoSleep and add test


Trivial merge