am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread

Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp

* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
  Make sure we cache the sampleTable again if using the caching datasource.
tree: 0b8b7c7a30cbdf27ae48aa58a44277f35aec13a1
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/