tree d7197b775a4ac4e57696222bf0e18d4b45555130
parent 83016715b9402e5200f076864113f5e7c747b591
parent 1199e4207ffd22f3befaa365986b6fef9cf4f089
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.