tree 88f2f18bff947914c2dee3df91ebee0a578668ad
parent daa65215054681a44df08d454fc241a435e1b852
parent 386d7900467ca52d48daf70d07498f10ae48aa80
author Jeff Sharkey <jsharkey@google.com> 1444325390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444325390 +0000

am 386d7900: am e0210648: am a0ef1048: am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev

* commit '386d7900467ca52d48daf70d07498f10ae48aa80':
  Hold wake-lock during copy operations.