tree 062a93fe41a41ab653162d9b1303188f318a11c2
parent 756590ca12d2fad4a8ae0cd0ecc0c113d3c2dc54
parent 2432b8116ad69e8540a43a0a0aa38026fe46e3cc
author Tom Cherry <tomcherry@google.com> 1548782829 -0800
committer android-build-merger <android-build-merger@google.com> 1548782829 -0800

Merge "Remove ro.expect.recovery_id" am: c683233b64
am: 2432b8116a

Change-Id: I42316425c3466278ff22b2e687c6fa45980cece1