From: Mohamad Ayyash <mkayyash@google.com>
Date: Thu, 16 Jun 2016 20:33:11 +0000 (+0000)
Subject: Merge \\"mksquashfsimage.sh: Make disable-4k-align a paramter\\" into nyc-dev am... 
X-Git-Tag: android-x86-8.1-r1~68^2~280
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4479a4a411193e82735aefbfa71c8ab012a2e5c3;p=android-x86%2Fsystem-extras.git

Merge \\"mksquashfsimage.sh: Make disable-4k-align a paramter\\" into nyc-dev am: 041bdd8e10
am: 6308a40ece

Change-Id: Iea538c79248e17a972583e84996db48cc4b2e9fd
---

4479a4a411193e82735aefbfa71c8ab012a2e5c3