[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)
diff --cc media/java/android/media/MediaScanner.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)