tree d30019daa5c6cc2cbdb4bb8384daa8f86b85709d
parent 8760db8da768f2c040db9504582447b971c006f3
parent d34917d19d44ed802085166c3247344ee3d11935
author Jeff Sharkey <jsharkey@android.com> 1481867524 +0000
committer android-build-merger <android-build-merger@google.com> 1481867524 +0000

Merge "Add new ext4 feature flags from kernel." am: d36c1d41ad am: 06b26159ac am: b2ce78c48d
am: d34917d19d

Change-Id: I81724d0922d553b1c11bdb930e23d2a6684ffc10