tree 76db008013c3391d38836ec3b09fd8d5449e5cb9
parent 6e232ed3ce77433f64a160f2b35d31502f89c86e
parent 82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea
author Yifan Hong <elsk@google.com> 1545258458 -0800
committer android-build-merger <android-build-merger@google.com> 1545258458 -0800

Merge changes from topic "vintf_object_recovery_mount"
am: 82fc6ae5b8

Change-Id: I68751cdd1601bac85f4d76de18fb6d2896cb6fa9