Android: Next step in finalizing android data handling

Signed-off-by: KillerFrca <killerfrca@gmail.com>
Merge branch 'master' of git@github.com:Frca/DotaTimer.git