| commit | 5e14d576587711c60157ff5cad3619a86623d8bd | [log] [tgz] |
|---|---|---|
| author | Simon Wilson <simonwilson@google.com> | Wed Jun 24 23:42:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 23:42:29 2015 +0000 |
| tree | bb45dfcfe7ff448693d4b279d0007bd4ea1ac734 | |
| parent | 5ee381704fbf9ed6482385e559d05d6ee89a8f54 [diff] | |
| parent | b7b7aedeb3c960890e3842ec8e729dbd10077ae4 [diff] |
am b7b7aede: Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev * commit 'b7b7aedeb3c960890e3842ec8e729dbd10077ae4': Add compressor options for squashfs system images