diff options
| author | Ed Tam <etam@google.com> | 2015-04-13 16:29:05 -0700 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2015-04-13 16:29:05 -0700 |
| commit | 438443e742d9cfb91c1193144a3b41744ffad34b (patch) | |
| tree | 2e7c3c910aebf933d713d047218fc46c5296e269 /fs_mgr/fs_mgr_priv.h | |
| parent | 51c6ad178e723a4cd59a143dd48d81ccdce2d489 (diff) | |
| parent | 79f338465213885900cea5a39f3aeeea083bbe51 (diff) | |
| download | system_core-438443e742d9cfb91c1193144a3b41744ffad34b.tar.gz system_core-438443e742d9cfb91c1193144a3b41744ffad34b.tar.bz2 system_core-438443e742d9cfb91c1193144a3b41744ffad34b.zip | |
resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp
Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
Diffstat (limited to 'fs_mgr/fs_mgr_priv.h')
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index d56111ae6..2d252e433 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -76,6 +76,7 @@ #define MF_FORCECRYPT 0x400 #define MF_NOEMULATEDSD 0x800 /* no emulated sdcard daemon, sd card is the only external storage */ +#define MF_FORMATTABLE 0x1000 #define MF_FILEENCRYPTION 0x2000 #define DM_BUF_SIZE 4096 @@ -83,4 +84,3 @@ int fs_mgr_set_blk_ro(const char *blockdev); #endif /* __CORE_FS_MGR_PRIV_H */ - |