fixed possible NPE
Merge branch 'master' into ice-cream-sandwich
- => _
Merge branch 'master' into ice-cream-sandwich
fixed possible NPE
actual branches
Merge branch 'master' into ice-cream-sandwich
actual branches
Merge branch 'master' into ice-cream-sandwich