commit | 1d014dbf3b8202f0bba428054079ea3359a9a945 | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Mon Aug 07 20:40:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 07 20:40:11 2017 +0000 |
tree | 0c5ecb3fb532e101951b9b5d9060f6848793c492 | |
parent | f1969980eed599d1c693b3fd0cd1337136b4fa67 [diff] | |
parent | ce8af0a31c8e97e02f7de1586ec7789af567eb00 [diff] |
Merge "[DO NOT MERGE] Workaround to avoid deadlock in MediaProvider" into nyc-dev am: 546f7005c4 am: ce8af0a31c Change-Id: Id84d2cdc929664faf2a54e9a4504f4d8258a327a