tree 1fd8b56aa58142916ae038c7549b57b3d6bb2314
parent b87264fb82818d5c64ccae454718845796953a88
parent aac44855caf0f2f7f2e655fc06ce9782b9c80af7
author JP Abgrall <jpa@google.com> 1424977857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424977857 +0000

am aac44855: am c19c6738: Merge "vold: acquire wakelock on fstrim thread"

* commit 'aac44855caf0f2f7f2e655fc06ce9782b9c80af7':
  vold: acquire wakelock on fstrim thread