tree 7ba237f7c11934cddd8072a3ada3d9c7a8379a54
parent 737a2e41bde4581bbbe12c3f54eed4d55d15c7e6
parent 4577dff5a0bb2b008a3454171898527174a71f74
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584334592 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584334592 +0000

Merge "Address the warnings in recovery code" am: 4577dff5a0

Change-Id: I1bb34dd7a1269421b1b54f3cbaf12ca91489804f