tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent d33e21a7ae7b37590ad41fac56f87141c597616c
parent 596219d9c2ea760a473c9f90bfa0317c326913af
author Tao Bao <tbao@google.com> 1440646706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646706 +0000

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

* commit '596219d9c2ea760a473c9f90bfa0317c326913af':