openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit '7b9c33b1e0e47f72d0af35d8a948900697da5871':
  Fix my incorrect merge resolution for 132b7d750e.
This commit is contained in:
Elliott Hughes 2013-07-11 19:01:36 -07:00 committed by Android Git Automerger
parent dccd777307 7b9c33b1e0
commit 435640312c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs_mgr/fs_mgr_priv.h
View File

@ -35,7 +35,7 @@ struct fstab_rec {
char *key_loc;
};
#define WAIT_TIMEOUT 5
#define WAIT_TIMEOUT 20
/* fstab has the following format:
*