Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43564031 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '7b9c33b1':
  Fix my incorrect merge resolution for 132b7d75.
parents dccd7773 7b9c33b1

fs_mgr/fs_mgr_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct fstab_rec { 
    char *key_loc;

};



#define WAIT_TIMEOUT 5

#define WAIT_TIMEOUT 20



/* fstab has the following format:

 *