OSDN Git Service

Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
authorJin Qian <jinqian@google.com>
Wed, 5 Jul 2017 22:44:10 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 22:44:10 +0000 (22:44 +0000)
am: 345d22c94a  -s ours

Change-Id: I3c0f8f4a7c0f614da34903addc680aa9a6839210


Trivial merge