Google Git
Sign in
android / platform / external / fio / refs/tags/android-6.0.1_r42
tagb056e80c971aad41c6b403df9e19da2fd885581f
taggerThe Android Open Source Project <initial-contribution@android.com>Mon May 02 18:15:08 2016 -0700
objectb9da4221fd8a628a696d70c33ba1e7e8cc00a8fe 
Android 6.0.1 release 42 (MOB30I)
commitb9da4221fd8a628a696d70c33ba1e7e8cc00a8fe[log] [tgz]
authorNick Kralevich <nnk@google.com>Mon Apr 06 16:03:45 2015 -0700
committerNick Kralevich <nnk@google.com>Mon Apr 06 16:03:45 2015 -0700
tree521217fc166478a4a6bfeb0ecd2f6d212e0746cd
parent365a153cfe8a3601af5d7c6c87679c20e84314e5 [diff]
parent90531c44420bef2430dc3be2fbcf38682a6df973 [diff]
resolved conflicts for merge of 90531c44 to master

Change-Id: Ia51e784b350063ea085d7cc62bd693aa3a5be455
tree: 521217fc166478a4a6bfeb0ecd2f6d212e0746cd
  1. arch/
  2. compiler/
  3. crc/
  4. engines/
  5. examples/
  6. exp/
  7. lib/
  8. os/
  9. profiles/
  10. t/
  11. tools/
  12. .gitignore
  13. Android.mk
  14. backend.c
  15. blktrace.c
  16. blktrace_api.h
  17. cairo_text_helpers.c
  18. cairo_text_helpers.h
  19. cconv.c
  20. cgroup.c
  21. cgroup.h
  22. client.c
  23. client.h
  24. configure
  25. COPYING
  26. debug.c
  27. debug.h
  28. diskutil.c
  29. diskutil.h
  30. err.h
  31. eta.c
  32. fifo.c
  33. fifo.h
  34. file.h
  35. filehash.c
  36. filehash.h
  37. filelock.c
  38. filelock.h
  39. filesetup.c
  40. FIO-VERSION-GEN
  41. fio.1
  42. fio.c
  43. fio.h
  44. fio_time.h
  45. flist.h
  46. flow.c
  47. flow.h
  48. gclient.c
  49. gclient.h
  50. gcompat.c
  51. gcompat.h
  52. gerror.c
  53. gerror.h
  54. gettime-thread.c
  55. gettime.c
  56. gettime.h
  57. GFIO-TODO
  58. gfio.c
  59. gfio.h
  60. ghelpers.c
  61. ghelpers.h
  62. goptions.c
  63. goptions.h
  64. graph.c
  65. graph.h
  66. hash.h
  67. helpers.c
  68. helpers.h
  69. HOWTO
  70. idletime.c
  71. idletime.h
  72. init.c
  73. io_ddir.h
  74. io_u.c
  75. io_u_queue.c
  76. io_u_queue.h
  77. ioengine.h
  78. ioengines.c
  79. iolog.c
  80. iolog.h
  81. json.c
  82. json.h
  83. libfio.c
  84. log.c
  85. log.h
  86. Makefile
  87. memalign.c
  88. memalign.h
  89. memory.c
  90. minmax.h
  91. MODULE_LICENSE_GPL
  92. MORAL-LICENSE
  93. mutex.c
  94. mutex.h
  95. NOTICE
  96. options.c
  97. options.h
  98. parse.c
  99. parse.h
  100. printing.c
  101. printing.h
  102. profile.c
  103. profile.h
  104. README
  105. REPORTING-BUGS
  106. SERVER-TODO
  107. server.c
  108. server.h
  109. smalloc.c
  110. smalloc.h
  111. stat.c
  112. stat.h
  113. td_error.c
  114. td_error.h
  115. thread_options.h
  116. tickmarks.c
  117. tickmarks.h
  118. time.c
  119. trim.c
  120. trim.h
  121. verify.c
  122. verify.h