| commit | dccd77730754b681f3517308359a34f86aecd99f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 11 18:50:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 18:50:25 2013 -0700 |
| tree | c96275c30a6c88092c695e68cd49b490031f8862 | |
| parent | 983939f79453433ca67b5382673b891d94343273 [diff] | |
| parent | 786b1232d201d46f59bd9da84bfcfcb9ad80bb6c [diff] |
am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master * commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c': fs_mgr_priv: Extend fs wait timeout to 20 seconds