commit ae118966dacfba0e0cd8425cf9059148262ea973
author Elliott Hughes <enh@google.com> Thu Jul 11 19:05:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 11 19:05:32 2013 -0700
tree c59a5a24bcaa2ee85f55fccc3f62ea12f0a8f6ab
parent ad989d038eda613819245db2541ecca60a2f99d9
parent 435640312ce48dab201d6f26a6258143a82f551e

am 43564031: am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.

* commit '435640312ce48dab201d6f26a6258143a82f551e':
  Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.

fs_mgr/fs_mgr_priv.h

diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h
index 3b9c46a..fe8cb80 100644
--- a/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@ -35,7 +35,7 @@
     char *key_loc;
 };
 
-#define WAIT_TIMEOUT 5
+#define WAIT_TIMEOUT 20
 
 /* fstab has the following format:
  *