Daniel Passos started work on Bug AGDROID-367