Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 18 Jan 2017 23:09:38 +0000 (23:09 +0000)

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

Wed, 18 Jan 2017 23:09:41 +0000 (23:09 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 18 Jan 2017 23:09:38 +0000 (23:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 23:09:41 +0000 (23:09 +0000)
diff --cc packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
Simple merge
diff --cc packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 18 Jan 2017 23:09:38 +0000 (23:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jan 2017 23:09:41 +0000 (23:09 +0000)
		1	2
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java	patch \|	diff1 \|	diff2 \|	blob \| history