Merge "Rework thumbnail cleanup" into oc-dr1-dev
am: 30755424d1 -s ours
Change-Id: I0246cd0dcb70293c1c183086334fcdea77d0a604
This commit is contained in:
am: 30755424d1 -s ours
Change-Id: I0246cd0dcb70293c1c183086334fcdea77d0a604