am 5379cd3f: Merge "Fix 4442284 Android Picasa sync over HTTP - data and credentials sent in clear text. DO NOT MERGE." into gingerbread

* commit '5379cd3f586062b9e0a2f31058326097dc727bfe':
  Fix 4442284 Android Picasa sync over HTTP - data and credentials sent in clear text. DO NOT MERGE.