changed bookmarks in Browser

	deleted:    packages/apps/Browser/res/raw/favicon_bbc.ico
	deleted:    packages/apps/Browser/res/raw/favicon_cnn.ico
	deleted:    packages/apps/Browser/res/raw/favicon_espn.ico
	deleted:    packages/apps/Browser/res/raw/favicon_facebook.ico
	deleted:    packages/apps/Browser/res/raw/favicon_msn.ico
	deleted:    packages/apps/Browser/res/raw/favicon_nytimes.ico
	deleted:    packages/apps/Browser/res/raw/favicon_picasa.ico
	deleted:    packages/apps/Browser/res/raw/favicon_twitter.ico
	deleted:    packages/apps/Browser/res/raw/favicon_weatherchannel.ico
	deleted:    packages/apps/Browser/res/raw/favicon_wikipedia.ico
	deleted:    packages/apps/Browser/res/raw/favicon_yahoo.ico
	deleted:    packages/apps/Browser/res/raw/thumb_bbc.png
	deleted:    packages/apps/Browser/res/raw/thumb_cnn.png
	deleted:    packages/apps/Browser/res/raw/thumb_espn.png
	deleted:    packages/apps/Browser/res/raw/thumb_facebook.png
	deleted:    packages/apps/Browser/res/raw/thumb_msn.png
	deleted:    packages/apps/Browser/res/raw/thumb_nytimes.png
	deleted:    packages/apps/Browser/res/raw/thumb_picasa.png
	deleted:    packages/apps/Browser/res/raw/thumb_twitter.png
	deleted:    packages/apps/Browser/res/raw/thumb_weatherchannel.png
	deleted:    packages/apps/Browser/res/raw/thumb_wikipedia.png
	deleted:    packages/apps/Browser/res/raw/thumb_yahoo.png
	modified:   packages/apps/Browser/res/values/bookmarks_icons.xml
	modified:   packages/apps/Browser/res/values/strings.xml
Merge branch '4.2.2_r1.2' of github.com:crewrktablets/android into 4.2.2_r1.2

Conflicts:
	packages/apps/Browser/res/values/strings.xml
changed bookmarks in Browser 2