am 03f73ba4: merge from open-source master
Merge "Runtest support for tests that need 'make' not 'mmm' to build."
Subject: Android application files for the Activity Testing Tutorial
Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c
Merge "Subject: Android application files for the Activity Testing Tutorial Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c"
First simple Fragment API demo.

Change-Id: I8d21485bc12445fe8a670796ddbc3e5ef57fd390
Merge commit '5a076f43d5815c8e32cd2c53dc4afce5063f6bd0' into oxygen_4.3

* commit '5a076f43d5815c8e32cd2c53dc4afce5063f6bd0':
  First simple Fragment API demo.
  Subject: Android application files for the Activity Testing Tutorial Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c

Conflicts:
	build/sdk.atree
	samples/ApiDemos/AndroidManifest.xml
	samples/Spinner/_index.html
	samples/SpinnerTest/AndroidManifest.xml
	samples/SpinnerTest/_index.html
	samples/SpinnerTest/src/com/android/example/spinner/test/SpinnerActivityTest.java