tree b877239ac9189af6538223a97e2eae4e196032cf
parent 96156d1f31fcdeaeffbc8a79cce28eb7264bdcad
parent b73e921a27ab6f5306c6bf6ffc51d2a336c3366d
author android-build-prod (mdb) <android-build-team-robot@google.com> 1524802922 -0700
committer android-build-merger <android-build-merger@google.com> 1524802922 -0700

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

Change-Id: I2f2b7830adb57bb638bd6058177132f2d860889a