a7284f0e72745d66155e1e282fc07113332790fa - platform/frameworks/base

commit	a7284f0e72745d66155e1e282fc07113332790fa	[log] [tgz]
author	Brian Carlstrom <bdc@google.com>	Fri May 27 00:07:42 2011 -0700
committer	Brian Carlstrom <bdc@google.com>	Fri May 27 01:21:50 2011 -0700
tree	b8660bbed40aef90e417b2ef60d8af24661e532c
parent	aa4fa2c5b704b60f025c34fec42db63ede9ebf35 [diff]

Tracking merge of dalvik-dev to master

Adapt to change in the way MockWebServer sets up CONNECT proxies.
  git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc

React to move of Base64 in libcore
  git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253

Expose and document android.net.HttpResponseCache.
  git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)

make update-api

Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e

api/13.xml[diff]
api/current.txt[diff]
core/java/android/net/http/HttpResponseCache.java[Added - diff]
core/java/android/webkit/DataLoader.java[diff]
core/tests/coretests/src/android/net/http/AbstractProxyTest.java[diff]
core/tests/coretests/src/android/net/http/HttpResponseCacheTest.java[Added - diff]

6 files changed

tree: b8660bbed40aef90e417b2ef60d8af24661e532c