Andorid rebase 20140511