| commit | 2511b65db69f5a996cac8731cd4cfde9ab1e943c | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Fri Nov 14 19:17:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 19:17:32 2014 +0000 |
| tree | 74056ddacf1018e229a78eeba861c09575cbaaef | |
| parent | 002116c95dfd09849f289018feee54b064714930 [diff] | |
| parent | 2dfadac1569126d72b2da42233afc908b7ec10a7 [diff] |
am 2dfadac1: (-s ours) am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 * commit '2dfadac1569126d72b2da42233afc908b7ec10a7': DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1