android-7 => android-5
protected code + TODO comment
Merge branch 'master' into ice-cream-sandwich
fixed possible NPE
Merge branch 'master' into ice-cream-sandwich
- => _
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs
Merge branch 'ics-catalogs' into ics-catalogs-reorder
fixed possible NPE
actual branches
Merge branch 'master' into ice-cream-sandwich
actual branches
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs
Merge branch 'ics-catalogs' into ics-catalogs-reorder