add  1548
Merge pull request #5 from BrianAlan/master

add  1548
Merge branch 'master' into mirror

Conflicts:
	WebViewTest/src/com/dem/test/MainActivity.java