tree 4e953b2acf4430b15d6d1929e6a207478106e263
parent b28221be05e9a9db18d708a59b9f302d4679d750
parent 19c292baa997ab46403fb31f433b4ac9dcb46f1e
author Tao Bao <tbao@google.com> 1490894731 +0000
committer android-build-merger <android-build-merger@google.com> 1490894731 +0000

Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" into oc-dev am: adcb843de7
am: 19c292baa9

Change-Id: I0c252127f6bf5b066fc16bc9565ef89d128edcb7