tree e6fc11338186b57dac029db5ca84f1d33ac0d515
parent 7e2c0da89f99912fe0790627ec5538776f0aab8b
parent 185cf862ca48734506f50c377c2a4f387bb8098a
author Marco Nelissen <marcone@google.com> 1521161391 +0000
committer android-build-merger <android-build-merger@google.com> 1521161391 +0000

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 skipped: 1160018fef am: 957e6ff8fe  -s ours am: 10dd321343  -s ours am: 9dadab0c7c  -s ours am: baf50ad211  -s ours
am: 185cf862ca  -s ours

Change-Id: I026575b3933d8212d36b39dcc5dc65a372d47ad1