diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-08-31 20:26:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-31 20:26:02 +0000 |
commit | 6a5ed849e832aac7da24fca5b7cf01d7c052f56e (patch) | |
tree | 8b440b5f40fef1fc9fd5872cad376fe5a8b2e476 /sdcard/fuse.cpp | |
parent | a7c4424ebcf2da390230157b8612d864098ab3f4 (diff) | |
parent | 9526819c7068266c1d063c7c4db039a534c7afff (diff) | |
download | system_core-6a5ed849e832aac7da24fca5b7cf01d7c052f56e.tar.gz system_core-6a5ed849e832aac7da24fca5b7cf01d7c052f56e.tar.bz2 system_core-6a5ed849e832aac7da24fca5b7cf01d7c052f56e.zip |
Merge "sdcard: Fix bad merge"
Diffstat (limited to 'sdcard/fuse.cpp')
-rw-r--r-- | sdcard/fuse.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sdcard/fuse.cpp b/sdcard/fuse.cpp index 6a972ea76..f549606a9 100644 --- a/sdcard/fuse.cpp +++ b/sdcard/fuse.cpp @@ -23,9 +23,6 @@ /* FUSE_CANONICAL_PATH is not currently upstreamed */ #define FUSE_CANONICAL_PATH 2016 -#define PROP_SDCARDFS_DEVICE "ro.sys.sdcardfs" -#define PROP_SDCARDFS_USER "persist.sys.sdcardfs" - #define FUSE_UNKNOWN_INO 0xffffffff /* Pseudo-error constant used to indicate that no fuse status is needed |