OSDN Git Service

am 6d76559e: Merge changes I972bbdab,I31a640de into honeycomb
authorBen Murdoch <benm@google.com>
Fri, 14 Jan 2011 17:41:47 +0000 (09:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jan 2011 17:41:47 +0000 (09:41 -0800)
commitc1aa670677a1c4a55696710efebfe569c6f505d1
tree1643c61d544401818462ab53c27a4c97dd91b60e
parentf1ab434b9a478da322f50f8085ff77900ee7e894
parent6d76559e247a4834e0ed3a254e2385575a0ac094
am 6d76559e: Merge changes I972bbdab,I31a640de into honeycomb

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