tree 0e3c46f8600fce13e770d693f905f02893e3707a
parent 1bd197eaa8a8bd4523d60cb72c0bae4741b13f18
parent f34a7af0eb3993ad57ea47b1035e6b35491f2462
author Adrien Schildknecht <adriens@google.com> 1481057977 +0000
committer android-build-merger <android-build-merger@google.com> 1481057977 +0000

Merge changes from topic 'e2fs_build'
am: f34a7af0eb

Change-Id: I33657126afe0092195a80fc8de813bb80712b951