OSDN Git Service

Merge \\"squashfs: make disable-4k-align a parameter\\" into nyc-dev am: 8ebbc4e7e2
authorMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jun 2016 20:33:10 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 20:33:10 +0000 (20:33 +0000)
am: 3336f9ae67

Change-Id: I6a81d1dfd2345adac498025d7ee335c9b4b044c6


Trivial merge