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

Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

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