Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp
am: ec999df45c
Change-Id: Idb8caf12d246e15f9d04135fcfb24be2dce58ef4
This commit is contained in: