| commit | ad989d038eda613819245db2541ecca60a2f99d9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 11 18:52:12 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 18:52:12 2013 -0700 |
| tree | 1ed23819de653ac4127ec1efb9e5da6f8e7fe420 | |
| 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