tree 5e7cad7e722922fe170af78444bb8223408c9c93
parent e397277ee94bc92dbd0c31e9bc8eb63889cede85
parent ef674454a14049439f8cf455d6088418ebda8c5c
author Tianjie Xu <xunchang@google.com> 1472772997 +0000
committer android-build-merger <android-build-merger@google.com> 1472772997 +0000

Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46  -s ours
am: ef674454a1

Change-Id: I0eba33f1c585254315cdcf4bbad0a6e70d4c4024