tree 5ba5eaba201388d083ba09015c592fcf25a1b6a9
parent 41584111b56bab9c8503db56d9acc6f9b198f50c
parent 07fe1c6696a060be32bf8d1a1bba048677ca6eac
author Android Build Merger (Role) <android-build-merger@google.com> 1462207032 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462207032 +0000

Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp