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

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

Change-Id: I601f54dcb907f1cbb247d8f1d4ef43871d5f92a7
---

6308a40eced7e59b380274d6671b859ff2fb739e