OSDN Git Service

Merge changes I972bbdab,I31a640de into honeycomb
authorBen Murdoch <benm@google.com>
Fri, 14 Jan 2011 17:40:11 +0000 (09:40 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Jan 2011 17:40:11 +0000 (09:40 -0800)
commit6d76559e247a4834e0ed3a254e2385575a0ac094
tree1643c61d544401818462ab53c27a4c97dd91b60e
parente54545f2281ff31809df88d5a0ba49779c84d00b
parente95b4a7d9ed67e6d6960e33e794e653aa0bd3887
Merge changes I972bbdab,I31a640de into honeycomb

* changes:
  Resolve MIME types for CacheResult in the same way as WebResponse.
  Hook up CacheManager for the Chromium HTTP stack