am 9420c0b3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '9420c0b338106eed246b362238b063ecdab3a710':
  Grab a partial wakelock when doing fstrim
gugelfrei
The Android Open Source Project 11 years ago committed by Android Git Automerger
commit dfbf110dfa

Diff Content Not Available