commit | 53651b9982f53236b767d766e85ec0ce3acc6f0f | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Mon Dec 01 19:32:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 19:32:12 2014 +0000 |
tree | af491afbea234318191b4335023f119582bade4a | |
parent | 719638afea79a3cee77fc75c4c54d36de2ca44a5 [diff] | |
parent | ff45e7df8aae0f55ce719de92102c7d522b62048 [diff] |
am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev * commit 'ff45e7df8aae0f55ce719de92102c7d522b62048': Be increasingly aggressive about fstrim if it isn't being run