tree ef89d63a7ae0fcbf37ba328ab25cc57b548d898d
parent a6ef409bbe119550c495f40572e87ab3e3a26e8e
parent cb9dd5d0e6b0eac85142e86ef5b4e0c2f487bc10
author Marco Nelissen <marcone@google.com> 1520890198 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1520890198 +0000

Merge changes from topic "thumbnails-nyc-mr1-dev" into nyc-mr2-dev

* changes:
  [automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a
  [automerger] Rework thumbnail cleanup am: 82a2a87474
  Rework thumbnail cleanup