tree 76db008013c3391d38836ec3b09fd8d5449e5cb9
parent a15b8d368da6c13b372180c9306c58890af70f81
parent cc6eb0ee449fc48013ef1f4b935429c84398ec4e
author Yifan Hong <elsk@google.com> 1545258881 -0800
committer android-build-merger <android-build-merger@google.com> 1545258881 -0800

Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8
am: cc6eb0ee44

Change-Id: I8cf4a096c15d6ec8fc9239807c1b0fa698c25d36