OSDN Git Service

am 9420c0b3: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:48:24 +0000 (05:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:48:24 +0000 (05:48 -0700)
commitdfbf110dfaad69b22036afc069f944f066f91b93
tree3684fa4289b2f1df92b2531cd678e03d3e16ca73
parente88e1eb745814740f6178047cb3578320058e0d0
parent9420c0b338106eed246b362238b063ecdab3a710
am 9420c0b3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '9420c0b338106eed246b362238b063ecdab3a710':
  Grab a partial wakelock when doing fstrim