OSDN Git Service

(root) / android-x86 / system-vold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e88e1eb 9420c0b)
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)
* commit '9420c0b338106eed246b362238b063ecdab3a710':
  Grab a partial wakelock when doing fstrim


Trivial merge
system/vold
About OSDN
Find Software
Develop Software
Help