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)
* commit '802cb097b4d8cfcb7681808026307d07eec93ba5':
  Introduce mksquashfsimage.sh


Trivial merge