tree 96f371cd0e96b76c6efceb5f213cfadb3ef64f5c
parent 0a32c73326d4c0e5c61a588b9699f7e7a72ab5d7
parent e6c86871f4aa3e2f30440ee6467f272cd0692a46
author Tao Bao <tbao@google.com> 1534908165 -0700
committer android-build-merger <android-build-merger@google.com> 1534908165 -0700

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

Change-Id: Ie3677c5edf9ff3d0a9e2bfccabfec97bab1d89d0