tree 1d49bf9dc21e3f6109867524881a182f92f1df80
parent 073451ae2173e51f5a803287de677dc7c6a68e4f
parent ec6a47ae461ecdc78141b457acba1537d913e1e7
author Tianjie Xu <xunchang@google.com> 1472772809 +0000
committer android-build-merger <android-build-merger@google.com> 1472772809 +0000

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

Change-Id: Ib30bcd792f0519dc92b56d90e19adfaa71ecb5b9