| commit | dfbf110dfaad69b22036afc069f944f066f91b93 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:24 2013 -0700 |
| tree | 3684fa4289b2f1df92b2531cd678e03d3e16ca73 | |
| parent | e88e1eb745814740f6178047cb3578320058e0d0 [diff] | |
| parent | 9420c0b338106eed246b362238b063ecdab3a710 [diff] |
am 9420c0b3: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9420c0b338106eed246b362238b063ecdab3a710': Grab a partial wakelock when doing fstrim