tree 6fb98bb202af7c584901231543a4fe9e3ce86d82
parent 6ca5e0c2529e87706362529d059dd74b42208cde
parent 260d4ba55fd48a27d2838478f24b68d51ff87feb
author Tao Bao <tbao@google.com> 1525751092 -0700
committer android-build-merger <android-build-merger@google.com> 1525751092 -0700

[automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4
am: 260d4ba55f  -s ours

Change-Id: I5cb92b10097463148a9b2cfe694de470d3dbec90