| commit | 39c423dcea6aa7f9c06211d01e80b9ed7618b170 | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Jun 18 23:29:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 18 23:29:01 2015 +0000 |
| tree | be0a62987f6a886114eb32844bfbbb1f0883f794 | |
| parent | 2fa9e939581d944f0204291c53356d6b8c3a938f [diff] | |
| parent | 802cb097b4d8cfcb7681808026307d07eec93ba5 [diff] |
am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev * commit '802cb097b4d8cfcb7681808026307d07eec93ba5': Introduce mksquashfsimage.sh