Jason Chen 15d18efddd resolved conflicts for merge of f0452c25 to master ...

Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c

2010-11-04 09:29:55 -07:00

..

BluetoothChat1.png

…

BluetoothChat2.png

…

BusinessCard1.png

Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.

2010-01-11 11:56:27 -08:00

BusinessCard2.png

Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.

2010-01-11 11:56:27 -08:00

ContactManager1.png

…

ContactManager2.png

…

CubeLiveWallpaper1.png

Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.

2010-02-09 18:38:30 -08:00

CubeLiveWallpaper3.png

Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.

2010-02-09 18:38:30 -08:00

HomeSample.png

…

JetBoy.png

…

MultiResolution.png

…

sample_lunarlander.png

…

sample_note.png

…

sample_notepad.png

…

sample_notepadtest_junit.png

Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12

2010-07-30 11:25:03 -07:00

SampleSyncAdapter1.png

Screenshots for sample syncadapter.

2010-02-03 11:21:45 -08:00

SampleSyncAdapter2.png

Screenshots for sample syncadapter.

2010-02-03 11:21:45 -08:00

SampleSyncAdapter3.png

Screenshots for sample syncadapter.

2010-02-03 11:21:45 -08:00

SearchableDictionary1.png

…

SearchableDictionary2.png

…

SipDemo.png

Added SIP Demo

2010-11-03 13:11:14 -07:00

Snake.png

…

SoftKeyboard.png

…

SpinnerTest1.png

Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.

2010-05-07 08:37:23 -07:00

SpinnerTest2.png

Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.

2010-05-07 08:37:23 -07:00

TicTacToeLib.png

Doc change: add toc references to tictactoe sample apps and screen shots.

2010-05-10 16:19:52 -07:00

TicTacToeMain.png

Doc change: add toc references to tictactoe sample apps and screen shots.

2010-05-10 16:19:52 -07:00

Wiktionary.png

…

WiktionarySimple.png

…

XmlPhotosAdapter.png

New XmlAdapters sample code.

2010-06-25 14:00:00 -07:00

XmlRssReader.png

New XmlAdapters sample code.

2010-06-25 14:00:00 -07:00