tree 863032ef175cf97c713f7cb16d2a3d8efe38c654
parent 7d5746309b5c41a708cdb4d5dba201a5d24e3dd1
parent b0d9b3594bd66a0769f73b8a424a1de8a94164ef
author David Anderson <dvander@google.com> 1527815500 -0700
committer android-build-merger <android-build-merger@google.com> 1527815500 -0700

Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176
am: b0d9b3594b

Change-Id: I86d3af476e87184e653de38cdb4faa1c9975ccba