AndroidNetworkContext (base class for ActivityNetworkContext & ServiceNetworkContext) + cookies in SynchroniserService
Merge branch 'master' into ice-cream-sandwich