tree 9532ff9024d4afd6b13eab874febdd3027e96c39
parent c5d85830c2d145282973efe6b49eb4fc0ffb7a6a
parent 5bcacab65f198e629d8372dd9d62cfa15cfcf540
author Bowgo Tsai <bowgotsai@google.com> 1507687686 +0000
committer android-build-merger <android-build-merger@google.com> 1507687686 +0000

Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d am: a4b15d7e2c am: c13381d680
am: 5bcacab65f

Change-Id: I5273783cdf84cca84084bb9b3513d68bef2af203