Android studio version

MERGE IT