| commit | fceb712e7fa2c7a4411a0535d2499355c6641dd9 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Mon May 04 17:30:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 17:30:47 2015 +0000 |
| tree | c0cfed633778ab3dcf7181b2414297730aa17b28 | |
| parent | a26bcbccc3c925a9c83cd56ebe5a7f6589fb9285 [diff] | |
| parent | b2a62122e8f512915836a12a703b2567cebddd99 [diff] |
am b2a62122: am a6f2a7e0: Merge "Fix NanoSleep and add test" * commit 'b2a62122e8f512915836a12a703b2567cebddd99': Fix NanoSleep and add test