OSDN Git Service

Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
authorJin Qian <jinqian@google.com>
Wed, 5 Jul 2017 22:48:00 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 22:48:00 +0000 (22:48 +0000)
commit4520b3e2ae9820dee732eba3f866dfad7dc2e022
tree365fd18e0e1b7fda920ff170173d14ed4f0619ab
parent6ca9c79df3e3bc9c92d6a4439eaebd55007aa5ea
parent94e877e74ec9a7a47748079926446a7d8fa0c53e
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15" into oc-dr1-dev-plus-aosp
am: 94e877e74e  -s ours

Change-Id: Id5620775d1bc3532ba3e5fc026dfc2ddf5928b01