OSDN Git Service

am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev
authorMohamad Ayyash <mkayyash@google.com>
Thu, 18 Jun 2015 23:29:01 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 23:29:01 +0000 (23:29 +0000)
commit39c423dcea6aa7f9c06211d01e80b9ed7618b170
treebe0a62987f6a886114eb32844bfbbb1f0883f794
parent2fa9e939581d944f0204291c53356d6b8c3a938f
parent802cb097b4d8cfcb7681808026307d07eec93ba5
am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev

* commit '802cb097b4d8cfcb7681808026307d07eec93ba5':
  Introduce mksquashfsimage.sh