tree b877239ac9189af6538223a97e2eae4e196032cf
parent 76f30864d532916ecfd636e55d4b42258708e21a
parent 91dd4feefca29432f7cc53251af89d5341fc4035
author android-build-prod (mdb) <android-build-team-robot@google.com> 1524803307 -0700
committer android-build-merger <android-build-merger@google.com> 1524803307 -0700

[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 am: b73e921a27  -s ours
am: 91dd4feefc  -s ours

Change-Id: Ia5b588a2b660078d155df7e28d0b2fad958d8267