Android merge

Is the newline split really necessary here? It's 2014, lines may be longer than 80 chars :)