tree e4a0f497cf05e1fbf39fd8970f8a7708545a4637
parent a256631c4de53c9a90ac1edff3b93ed1f1649612
parent 081c05f39576ec9d59eba7077b6f60caa0b85c64
author Yifan Hong <elsk@google.com> 1545261980 -0800
committer android-build-merger <android-build-merger@google.com> 1545261980 -0800

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

Change-Id: Ia3de886ae5a7eb7a0549b224bc0c031501f688dc