OSDN Git Service

am a2b08988: am 12f454e2: Merge changes I7dc2edd4,I419b2ec0
authorColin Cross <ccross@android.com>
Mon, 14 Sep 2015 18:10:13 +0000 (18:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Sep 2015 18:10:13 +0000 (18:10 +0000)
commit3ea857a936e0c0fd293abcf8a43b2cdfbe718b02
tree37093a2eeb3cbe5af9068ad9cde7cbea17bd1dfd
parent38fe1f22b544eaf0402dbc5c03ca2390f2d2440e
parenta2b089889231d3347e3db59cd89afa0fe99f1ee4
am a2b08988: am 12f454e2: Merge changes I7dc2edd4,I419b2ec0

* commit 'a2b089889231d3347e3db59cd89afa0fe99f1ee4':
  iotop: add total read/write stats
  iotop: fix bytes per second, and add accumulation