tree 365fd18e0e1b7fda920ff170173d14ed4f0619ab
parent 4520b3e2ae9820dee732eba3f866dfad7dc2e022
parent 48ac112365c927c35d8d915176bf645f5dedb097
author Jin Qian <jinqian@google.com> 1499357648 +0000
committer android-build-merger <android-build-merger@google.com> 1499357648 +0000

Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
am: 48ac112365  -s ours

Change-Id: Ide8b4f037be3e7951d4987e93d0a8c355a3b6da9