LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '0f7185d9' into master, resolve conflicts.

Browse Source 
Conflicts:
	samples/Spinner/_index.html
	samples/SpinnerTest/AndroidManifest.xml
	samples/SpinnerTest/_index.html
	samples/SpinnerTest/src/com/android/example/spinner/test/SpinnerActivityTest.java

Change-Id: Ibd2bbd81c828c4a4337d2d0e397bd9a0b1e90728
This commit is contained in:
Dirk Dougherty
2010-05-07 10:44:30 -07:00
parent 41d44d30bb 0f7185d921
commit fbb0042fe4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Spinner/_index.html
View File

@@ -19,3 +19,5 @@ management of state across invocations and power cycles.
For more information about this application, see the
<a href="../../../resources/tutorials/testing/activity_test.html">Activity Testing</a> tutorial.
</p>
<img alt="The Spinner application" src="../images/testing/spinner_main_screen.png" />