See changelist for 1.1 -> 1.2 for a complete list of changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/player/IMediaAuthListener.java