android 130709
Merge branch 'Android'