tree 0e3c46f8600fce13e770d693f905f02893e3707a
parent f4cbb54596cba68ecc6691b5b78bd20380438ad2
parent fa2d5719108a3d832f0d0fe0330d7055c290639a
author Adrien Schildknecht <adriens@google.com> 1481058579 +0000
committer android-build-merger <android-build-merger@google.com> 1481058579 +0000

Merge changes from topic 'e2fs_build' am: f34a7af0eb am: be957e0e0f
am: fa2d571910

Change-Id: I6969880bc02acaf716874d4e6c0f74fc03603839