tree 85bd89f0be2e5f8c44505a95a092dbb56eeec329
parent 4a0453c8a346d94b5d7fb58947b5e609e177b7e4
parent 08021f01e37e9d983542d44f76e17f08b3de8580
author Android Merger <android-build-merger@google.com> 1505474608 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1505474608 +0000

Merge "Merge "[DO NOT MERGE] Workaround to avoid deadlock in MediaProvider" into nyc-dev am: 546f7005c4 am: ce8af0a31c am: 1d014dbf3b am: 7595888151 am: 2cd69ba971  -s ours am: a73391668f  -s ours"