OSDN Git Service

am 6999c941: (-s ours) am b89e81dc: fs_config: align with new explicit fs_config...
authorThierry Strudel <tstrudel@google.com>
Thu, 27 Aug 2015 11:16:54 +0000 (11:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:16:54 +0000 (11:16 +0000)
* commit '6999c941d7e6ec256e3047a5136e00502206fefd':


Trivial merge