tree 3a4a4ddeff69c5e225afb934e5f46d0d7c1789f2
parent 48ac112365c927c35d8d915176bf645f5dedb097
parent 22dc5b2af39efb6bede67c30b6d24e2fe02c4e7d
author Android Build Merger (Role) <android-build-merger@google.com> 1499357274 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499357274 +0000

Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af" into oc-dr1-dev-plus-aosp