tree be0a62987f6a886114eb32844bfbbb1f0883f794
parent 2fa9e939581d944f0204291c53356d6b8c3a938f
parent 802cb097b4d8cfcb7681808026307d07eec93ba5
author Mohamad Ayyash <mkayyash@google.com> 1434670141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434670141 +0000

am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev

* commit '802cb097b4d8cfcb7681808026307d07eec93ba5':
  Introduce mksquashfsimage.sh