tree f4cd67a662fb41cf5a5a7907fb22bc9540f4312e
parent 0a999b42ba8a3935db0b50133ddc00610c868b30
parent 33cc4403b5da5e3273d0cc89aaf603301d67544a
author Luis Hector Chavez <lhchavez@google.com> 1529612002 -0700
committer android-build-merger <android-build-merger@google.com> 1529612002 -0700

Merge "e2fsdroid: Correctly process the root inode" am: 702c28b202
am: 33cc4403b5

Change-Id: I5f0e07ab579f0cf5c5728a110f7e454fc2c9df60