Merge "Exclude virtual files from ACTION_SEND." into nyc-dev

author Tomasz Mikolajewski <mtomasz@google.com>

Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)

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

Wed, 27 Apr 2016 01:11:04 +0000 (01:11 +0000)
author Tomasz Mikolajewski <mtomasz@google.com>
Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Apr 2016 01:11:04 +0000 (01:11 +0000)
diff --cc packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
Simple merge
author	Tomasz Mikolajewski <mtomasz@google.com>
	Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Apr 2016 01:11:04 +0000 (01:11 +0000)