tree b153507f5a489ef30943f01cd8056fa5b5bb6ffa
parent 49facf582d635bd6fe1ed91c992a37a5e03ccced
parent e681626afa733746ba432557609de6aed67e95d9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584336828 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584336828 +0000

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

Change-Id: I72e44c8d1fdc6ed84ed48a9221b9eaa5df7bbd15