| commit | 350e43b0c302d569b370cabb8f4c5f34e82f2d9e | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Fri Jun 19 13:57:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 13:57:20 2015 +0000 |
| tree | c97722457133a90402a1486375d4223a79a5db84 | |
| parent | 08df6fccf60943358c414c2e8e3b368458c50408 [diff] | |
| parent | 39c423dcea6aa7f9c06211d01e80b9ed7618b170 [diff] |
am 39c423dc: am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev * commit '39c423dcea6aa7f9c06211d01e80b9ed7618b170': Introduce mksquashfsimage.sh