| commit | f034517dfd8e84667bde827d33d95b4b02f80d4a | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Apr 09 20:34:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 20:34:44 2015 +0000 |
| tree | a81ad56e1dfa4b7ecebbcd52d9f5e7d46c3215db | |
| parent | 01bd4e822082911f82af25aa8306f6d893a26904 [diff] | |
| parent | 2b4607c677dccc800f3d194b65646570d1813660 [diff] |
am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" * commit 'be940153816b28cf1cb68f7f135c77f5f1585fe1': Revert "Revert "fs_mgr_verity: Add support for squashfs""