possible code for android 2.1 authentication problem resovle
Merge branch 'master' into ice-cream-sandwich