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