am e1f3976b: Merge "Make sure we cache the sampleTable again if using the...
am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
Merge commit 'e1f3976b' into gingerbread-plus-aosp
* commit 'e1f3976b':
Make sure we cache the sampleTable again if using the caching datasource.