Completed chapter 26.
Introducing sample conflict.
Introducing sample conflict on branch.
Merge branch 'f26.9'

Conflicts resolved nicely:
	src/com/vmware/android/photogallery/FlickrFetchr.java
	src/com/vmware/android/photogallery/PhotoGalleryFragment.java