tree fa24e3b948d2c26f65995957513a131cf5a9a415
parent 3bddf7475262df61b8add01100ed79767e05ccd3
parent 1b6d3485fc2a4653e37824b32d40ff91bdf84855
author Mohamad Ayyash <mkayyash@google.com> 1466094273 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466094274 +0000

Merge "squashfs: make disable-4k-align a parameter" into nyc-dev