tree 69a27699d88248418f2cdae3e00748d5bb43bfae
parent 2fb025d0071d53a6030dacbff21d0da057244ec1
parent 41d6d7c42436baae1a9084c237350e21c22f57f1
author Dmitry Dementyev <dementyev@google.com> 1522730165 -0700
committer android-build-merger <android-build-merger@google.com> 1522730165 -0700

Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
am: 41d6d7c424

Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1