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

Change-Id: Ie2a0a7495696e74c9af44c35e3759219c07d4de9


Trivial merge