diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-11 18:52:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-11 18:52:12 -0700 |
| commit | ad989d038eda613819245db2541ecca60a2f99d9 (patch) | |
| tree | 1ed23819de653ac4127ec1efb9e5da6f8e7fe420 /trusty/coverage/coverage_test.cpp | |
| parent | a76baaabe56b98e23861e89722bd1425f92dbc2c (diff) | |
| parent | dccd77730754b681f3517308359a34f86aecd99f (diff) | |
am dccd7773: am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master
* commit 'dccd77730754b681f3517308359a34f86aecd99f':
fs_mgr_priv: Extend fs wait timeout to 20 seconds
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions