tree 304dd438b200f766a1e8e0d18c9098447e0bb60b
parent 6bbf28da27dde1d3154456ab44a68ff62ee81c3c
parent b87937cdea689594a293979b30b13054e7455dee
author Ken Sumrall <ksumrall@android.com> 1364418955 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364418955 +0000

Merge "Vold: Add the fstrim subsystem to vold" into jb-mr2-dev