| commit | 225b9a1c7b67366701e3c26ddc2593d4428660ff | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Aug 21 21:37:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 21:37:36 2015 +0000 |
| tree | bccb76dad86891d1e2ab1f85d89534e5a522d5fe | |
| parent | bbfe8b1e71adda4e11639b480591670655a6550d [diff] | |
| parent | b99a4afc9f7cecb36f51c4464170a66c83dbe652 [diff] |
am b99a4afc: am 8cf90a69: am 59e335fd: am 29911cb5: Merge "Temporary workaround for intermittent MediaStore_FilesTest failure" into lollipop-mr1-cts-dev * commit 'b99a4afc9f7cecb36f51c4464170a66c83dbe652': Temporary workaround for intermittent MediaStore_FilesTest failure