Chris Craik 7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
..
2013-01-16 15:34:35 -08: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.