tree 07432b1e206bdc161532c5c94b65a92d0d705e27
parent fafcabd0dd4432de3c7f5956edec23f6ed241b56
parent 132b7d750e6f3e835676dfc5edbb94978f9370f8
author Ken Sumrall <ksumrall@android.com> 1373496157 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1373496157 +0000

Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"