tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 43e4abd95f2e7d97fe699201110aa33a804354f5
parent ca66fc1cb204dfe9e9b8c8eaad5be95a78207212
author Tao Bao <tbao@google.com> 1440684827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684827 +0000

am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."

* commit 'ca66fc1cb204dfe9e9b8c8eaad5be95a78207212':