stuff
Merge remote-tracking branch 'AndroidL/master'