Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5

Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d
tree: d4c85f705d53d715cbb7aacaf456d9f2c70a1441
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags