Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Merge the two PA example repos

Conflicts:
	.gitignore
	02/FillListTask/tools/ide/eclipse/classpath
	02/SharedListTask/tools/ide/eclipse/classpath
	03/TestApp/tools/ide/eclipse/classpath
	06/AIDLDemo/tools/ide/eclipse/classpath
	06/AsyncTaskDemo/tools/ide/eclipse/classpath
	07/AndroidUIDemo/tools/ide/eclipse/classpath
	08/SimpleFragment/default.properties
	10/MicroJobs/tools/ant/build.xml
	11/FinchLifecycle/default.properties
	11/FinchLifecycle/proguard.cfg
	11/FinchLifecycleBackport/proguard.cfg
	12/FinchVideo/tools/ant/build.xml
	16/SensorDemos/default.properties
	16/SensorDemos/proguard.cfg
	17/ClientDemo/default.properties
	18/NDKDemo/default.properties
	AIDLDemo/project.properties
	AIDLDemo/tools/ide/eclipse/classpath
	AndroidUIDemo/project.properties
	AndroidUIDemo/res/layout/main.xml
	AndroidUIDemo/res/values/colors.xml
	AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/view/DotView.java
	AndroidUIDemo/tools/ide/eclipse/classpath
	AndroidViewDemo/project.properties
	AsyncTaskDemo/proguard.cfg
	AsyncTaskDemo/tools/ant/build.xml
	AudioPlayer/proguard.cfg
	FillListTask/tools/ide/eclipse/classpath
	FinchChat/tools/ide/eclipse/classpath
	FinchFramework/project.properties
	FinchFramework/src/com/finchframework/finch/views/MesgEditText.java
	FinchLifecycle/project.properties
	FinchLifecycle/tools/ant/build.xml
	FinchLifecycle/tools/ide/eclipse/classpath
	FinchLifecycleBackport/proguard.cfg
	FinchLifecycleBackport/project.properties
	FinchVideo/project.properties
	FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java
	NDKDemo/proguard.cfg
	NDKDemo/tools/ant/build.xml
	README.txt
	SearchDemo/project.properties
	SensorDemos/proguard.cfg
	SharedListTask/tools/ide/eclipse/classpath
	UIFramework/proguard.cfg
	UIFramework/project.properties
latest commit f93c51f3ef
@bmeike authored
..
Failed to load latest commit information.
res
src/com/oreilly/demo/android/pa/simplefragment
tools
AndroidManifest.xml
proguard.cfg
project.properties
Something went wrong with that request. Please try again.