Merge "Display file names in Media libraries in grid mode" into nyc-dev

author Aga Wronska <agawronska@google.com>

Fri, 11 Mar 2016 01:23:19 +0000 (01:23 +0000)

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

Fri, 11 Mar 2016 01:23:20 +0000 (01:23 +0000)
author Aga Wronska <agawronska@google.com>
Fri, 11 Mar 2016 01:23:19 +0000 (01:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 01:23:20 +0000 (01:23 +0000)
diff --cc core/java/android/provider/DocumentsContract.java
Simple merge
author	Aga Wronska <agawronska@google.com>
	Fri, 11 Mar 2016 01:23:19 +0000 (01:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 11 Mar 2016 01:23:20 +0000 (01:23 +0000)