| commit | 406c15912a0d732f804cf18bad0f0a02a37b20b4 | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Apr 09 20:40:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 20:40:39 2015 +0000 |
| tree | a81ad56e1dfa4b7ecebbcd52d9f5e7d46c3215db | |
| parent | 196a78038a7651511f3112a91a1a06594c05cf21 [diff] | |
| parent | f034517dfd8e84667bde827d33d95b4b02f80d4a [diff] |
am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" * commit '7a91e93e8cc2dd9910513c6bcc9380b4c7cf8e0e': Revert "Revert "fs_mgr_verity: Add support for squashfs""