adding step 3
merging
merge branch 'master' of https://github.com/pengying/androidtv-codelab