tree c60d6e6466bb681c49fdd2a1c34490f47d82d587
parent ca4a879f9dcc64d6cadf444a5d9e2b984f31837a
parent b50ae71d99cf9b77c9d5416e61ecb584bc8d03d7
author Marco Nelissen <marcone@google.com> 1520908185 +0000
committer android-build-merger <android-build-merger@google.com> 1520908185 +0000

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68 am: d08bb4b174 am: b3f50c9ccb  -s ours
am: b50ae71d99  -s ours

Change-Id: Ic18f8e6449d4310924bac6a40acff9df4d743dc6