OSDN Git Service

resolved conflicts for merge of ee3d4d49 to mnc-dev
authorSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:22:44 +0000 (16:22 -0700)
committerSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:22:44 +0000 (16:22 -0700)
commit12edfcadb72e6a3a8349e7404a14fd71dccff6c4
treeca1fd3449c472c01c99048736cb98a74dda6b01c
parent241227995bb6102a0a216d9e1664a55e04d116f6
parentee3d4d49ddcd8cd100c150091ffa85ae25e756fb
resolved conflicts for merge of ee3d4d49 to mnc-dev

Change-Id: Ibfa043e2a7400e659f0355bcd139352b02a058e9
squashfs_utils/mksquashfsimage.sh