tree 6ac9fd46c8580f04885224e18d92df4ffb238888
parent 741fef7395179622c63d575f0961a2497506d9d4
parent 9243da900839d87a5e55db69d88e469543919cac
author Rick Yiu <rickyiu@google.com> 1557217679 -0700
committer android-build-merger <android-build-merger@google.com> 1557217679 -0700

Merge "Apply initial settings for blkio cgroup"
am: 9243da9008

Change-Id: I2aaa9a9f3267e6e57c44967144de2a4a8d76126c