Andorid rebase 20140421