merge from tag exdroid a10