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:11 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 22:44:11 +0000 (22:44 +0000)
am: 345d22c94a  -s ours

Change-Id: Ia235a14890d1538b32e2bef37ba29f1df0dbab1b


Trivial merge