Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev

author Jeff Sharkey <jsharkey@google.com>

Thu, 7 Apr 2016 17:56:20 +0000 (17:56 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 7 Apr 2016 17:56:21 +0000 (17:56 +0000)
author Jeff Sharkey <jsharkey@google.com>
Thu, 7 Apr 2016 17:56:20 +0000 (17:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2016 17:56:21 +0000 (17:56 +0000)
diff --cc core/java/android/os/storage/StorageManager.java
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Thu, 7 Apr 2016 17:56:20 +0000 (17:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 Apr 2016 17:56:21 +0000 (17:56 +0000)