tree ca9a52f09fd368d0d7d8a1fb6e2ff3ade923473e
parent 409de10d2e301e4e73bee797f228519a987664df
parent 9ba641611090693e48b9db4b521627021593202b
author Jin Qian <jinqian@google.com> 1479840159 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1479840159 +0000

Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master"