OSDN Git Service

am 12f454e2: Merge changes I7dc2edd4,I419b2ec0
authorColin Cross <ccross@android.com>
Mon, 14 Sep 2015 18:03:04 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Sep 2015 18:03:04 +0000 (18:03 +0000)
commita2b089889231d3347e3db59cd89afa0fe99f1ee4
treefefc1eba3991734020c0632ccaa01671945444d8
parent10e4a8d50bf7822c591731b55b63b201cbffc196
parent12f454e24a518d81fe42043b7142582b81694363
am 12f454e2: Merge changes I7dc2edd4,I419b2ec0

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