OSDN Git Service

Merge "Rework thumbnail cleanup" into oc-mr1-dev
authorMarco Nelissen <marcone@google.com>
Fri, 9 Mar 2018 23:00:20 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Mar 2018 23:00:20 +0000 (23:00 +0000)
commit6db0f4dac8ed9a3f0d5df58d463c293df083a4ab
treeab947d9597d03bab8a28b595bee6e02870e1493e
parentc4ee36b84fd8971d63c2ba2f8abc881924766023
parentb20a329f4c1975f9271aec965c8497f7142f81f5
Merge "Rework thumbnail cleanup" into oc-mr1-dev
am: b20a329f4c

Change-Id: I17b77312edb4fa03af1e89543ed5c27f4501d51c
core/java/android/provider/MediaStore.java
media/java/android/media/MediaScanner.java