tree 6fb98bb202af7c584901231543a4fe9e3ce86d82
parent 4fb85d58d68f77b9700dfa09084aae0c07894b59
parent 9faf29248876291a16bcc9c14aba1b9c7b125a8c
author Tao Bao <tbao@google.com> 1525751482 -0700
committer android-build-merger <android-build-merger@google.com> 1525751482 -0700

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

Change-Id: I2147acff8dfb76ba106796b9b7eb7fb9de840097