OSDN Git Service

resolve merge conflicts of 041bdd8 to nyc-mr1-dev
authorMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jun 2016 20:17:32 +0000 (13:17 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jun 2016 20:17:32 +0000 (13:17 -0700)
commit0c2c44bfac3cef379470c78038eab73ce8fa6b58
treec64d66babf560fc46c241f0f9c5438b1be638702
parent5ac3592d7f026c4af9b7f6e1207db116cbaf9d7e
parent041bdd8e102e20cc8345560f037a8b032bd132e8
resolve merge conflicts of 041bdd8 to nyc-mr1-dev

Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e
squashfs_utils/mksquashfsimage.sh