tree f375e7f5e9f183289bbd5c907f90b89924f11aa8
parent fa845c6d4637fee51b34d9c1cf06db42b97ac0f4
parent a0f2bf56e30f580535229fa6a58e7d48b762727c
author Andreas Huber <andih@google.com> 1323115421 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323115421 -0800

am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1

* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
  Properly identify how much metadata we need to cache in order to instantiate