formatting
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
no bitmap reference in pure java (non-android) code
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2