OSDN Git Service

am 0b09e1c2: resolved conflicts for merge of 04bf8bdf to mnc-dev-plus-aosp
authorMohamad Ayyash <mkayyash@google.com>
Thu, 25 Jun 2015 01:21:36 +0000 (01:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 01:21:36 +0000 (01:21 +0000)
* commit '0b09e1c262ab331bb621490338133b5e0d14ff52':
  mksquashfsimge.sh: Support creating a sparse image


Trivial merge