native code cleanup: synchronization with ics branch
Merge branch 'master' into android-1.5
formatting cleanup
Merge branch 'master' into android-1.5
TreeActivity is now a parmatrized type
Merge branch 'master' into android-1.5
parametric base class in NetworkLibraryActivity
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
merge order
Merge branch 'master' into android-1.5
public => protected
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
version number => 1.7
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml
imports order
Merge branch 'master' into android-1.5