am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
tree: 267d82161d660a6622be0ae6abc538d4e7d5d106
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/