tree 867a7d5695cea739e5ca27b436c7732249864ed9
parent f55ce39224d1547cad33fed92382a1248760fd45
parent 236aea3579787961fdd41d87574760b63323c0c1
author Jamie Gennis <jgennis@google.com> 1320346514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320346514 +0000

am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1

* commit '236aea3579787961fdd41d87574760b63323c0c1':
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking