Paul Duffin 17e5a2d851 Merge "Refactor code incompatible with Mockito 2.7.13"
am: 2a3a4f81f9

Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8
2017-03-10 20:43:07 +00:00
..
2016-11-04 19:31:54 -07:00

MediaFrameworkTest/
    Uses instrumentation and so can be run with runtest.
    It assumes /sdcard/media_api/ has been populated.

contents/media_api/
    Push to /sdcard/media_api/ for use with MediaFrameworkTest:
    adb shell mkdir /sdcard/media_api
    adb push contents/media_api/ /sdcard/media_api/

All other subdirectories are manual tests or sample apps.