tree 9fa6118f6e3f60ec57f7e78d4de24d744b4d275f
parent 1f66ec8b908bb37c342c8bf97f74ecce913bfcc3
parent 281a868c69e0915efc16eb3c65f669bbf0df69df
author Jeff Sharkey <jsharkey@android.com> 1442868008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442868008 +0000

am 281a868c: am e1a6299b: Relax locking when scanning private volumes.

* commit '281a868c69e0915efc16eb3c65f669bbf0df69df':
  Relax locking when scanning private volumes.