tree ad8d7e3a88ba92b5d5c74090fb3048f7be9a5338
parent 85ab5ca16a9080d78d9dd963d1dcc2f3d3256c4f
parent c13381d6807f006c3f414767068bdd000ac14025
author Bowgo Tsai <bowgotsai@google.com> 1507687350 +0000
committer android-build-merger <android-build-merger@google.com> 1507687350 +0000

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

Change-Id: I06eb6e086a1fbdff4de1c4bed28d136c5e81caab