file icons
Merge branch 'master' into ice-cream-sandwich
missing string
Merge branch 'master' into ice-cream-sandwich