Chap 5 adjust android studio 1 rc 2
Merge remote-tracking branch 'origin/master'