tree d7197b775a4ac4e57696222bf0e18d4b45555130
parent f03e6c803708d8d5aa7d749f274c9ed847d56940
parent 41d0b6d3ca4e56f0cc0ae5c19e563f80c8f494d0
author Treehugger Robot <treehugger-gerrit@google.com> 1481736984 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1481736985 +0000

Merge changes Ic190bd8c,I865044c8

* changes:
  Convert missed ERROR() to LOG(ERROR).
  Fix include order.