tree 96f371cd0e96b76c6efceb5f213cfadb3ef64f5c
parent d8e8c7b6fa342de4692b00b7f60e05f409c4f211
parent 6a122dceb3a081399a052bf4810fa998cc7c1558
author Tao Bao <tbao@google.com> 1534935179 -0700
committer android-build-merger <android-build-merger@google.com> 1534935179 -0700

Merge "Depend on mke2fs.conf.recovery." am: aa536568b3 am: e6c86871f4
am: 6a122dceb3

Change-Id: I1e1e887629a586dfb32321a054369eda7fa8a276