Merge branch 'fix-348' of https://github.com/omor1/fio
authorJens Axboe <axboe@fb.com>
Sun, 30 Apr 2017 22:48:24 +0000 (16:48 -0600)
committerJens Axboe <axboe@fb.com>
Sun, 30 Apr 2017 22:48:24 +0000 (16:48 -0600)
1  2 
os/os-android.h

diff --cc os/os-android.h
Simple merge