| commit | e06bee95ec8c103b4a4d857b07842d0f744b896f | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Apr 09 21:00:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 21:00:26 2015 +0000 |
| tree | 1be15937ef88be7ff9116d6cb1212447c01d975c | |
| parent | fe08098b9659e5282d4c69ccddf2941adddf1901 [diff] | |
| parent | 406c15912a0d732f804cf18bad0f0a02a37b20b4 [diff] |
am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" * commit 'd087e6f3ff0f928fb1ad7e47e488a3345ab8a555': Revert "Revert "fs_mgr_verity: Add support for squashfs""