Merge branch 'master' into nook Conflicts: AndroidManifest.xml
Merge branch 'yota2' into kindle Conflicts: AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into yota2
resources cleanup
Merge branch 'master' into nook
Merge branch 'yota2' into kindle
release date