tree ea23d732e573f8617fc1a09d4680c2ed667c0eff
parent 46ff838582efb054d228fba3c6384c9869037f38
parent 3bddf7475262df61b8add01100ed79767e05ccd3
author Mohamad Ayyash <mkayyash@google.com> 1466007175 +0000
committer android-build-merger <android-build-merger@google.com> 1466007175 +0000

Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am: 3bddf74752

Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489