first commit to the branch of android
second to android
Merge branch 'android'